Refactor packaging.

Packaging was always not so good. With the arrival of yet another
packaging system to support, with QtSDK and Harmattan, it was overdue
time to refactor the build system.

Factored out all the places where Qt3D and QtQuick3D dependencies were
exactly 3 levels below the source .pro file. This catches all of the
examples and all of the demos, except for the ones in the tutorials
directories. It is fine if those don't appear in packages, since their
main value is in examining them in the IDE, rather than just having a
package run them for you. It also catches both of the import plugins.

Thus we save a huge amount of duplication of packaging information and
can place the Qt SDK Harmattan packaging into a couple of variables in a
new pkg.pri file. The two deps are now in a qt3d_pkg_dep.pri and
qt3dquick_pkg_dep.pri file which include the pkg.pri.

Change-Id: I28de17d7faa5ccf9157afad99471079c0b62ee87
Reviewed-on: http://codereview.qt.nokia.com/1191
Reviewed-by: Sarah Jane Smith

161 files changed, 830 insertions, 1726 deletions

diff --git a/demos/qt3d/cubehouse/cubehouse.pro b/demos/qt3d/cubehouse/cubehouse.pro
index 27eae6f8..a4669815 100644
--- a/demos/qt3d/cubehouse/cubehouse.pro
+++ b/demos/qt3d/cubehouse/cubehouse.pro
@@ -3,6 +3,8 @@ TARGET = cubehouse
 CONFIG += qt warn_on
 !package: CONFIG += qt3d
 
+include(../../../qt3d_pkg_dep.pri)
+
 SOURCES = cubeview.cpp main.cpp projectivetextureeffect.cpp
 HEADERS = cubeview.h projectivetextureeffect.h
 win32:DEFINES+=_CRT_SECURE_NO_WARNINGS
@@ -12,37 +14,6 @@ OTHER_FILES += \
     shaders/objectlineartexgen.frag \
     shaders/objectlineartexgen.vert
 
-package {
-    maemo {
-        applnk.files = cubehouse.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qt3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-    macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
-        LIBS += -framework Qt3D -F../../../src/threed
-        INCLUDEPATH += ../../../src/threed/Qt3D.framework/Versions/1/Headers
-    } else {
-        win32 {
-            CONFIG(debug, debug|release) {
-                TARGET = $$member(TARGET, 0)d
-                LIBS += ..\\..\\..\\src\\threed\\debug\\Qt3Dd.lib
-            } else {
-                LIBS += ..\\..\\..\\src\\threed\\release\\Qt3D.lib
-            }
-        } else {
-            LIBS += -L../../../src/threed -lQt3D
-        }
-        INCLUDEPATH += ../../../include/Qt3D
-    }
-    QT += opengl
-    target.path += $$[QT_INSTALL_BINS]
-    INSTALLS += target
-} else {
-    DESTDIR = ../../../bin
-}
 OTHER_FILES += \
     cubehouse.rc
 
diff --git a/demos/qt3d/dirs b/demos/qt3d/dirs
deleted file mode 100644
index 7b7a72f2..00000000
--- a/demos/qt3d/dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-pageflip
-photobrowser3d
-shapes
-teaservice
diff --git a/demos/qt3d/pageflip/pageflip.pro b/demos/qt3d/pageflip/pageflip.pro
index 3ac9e250..8f71925f 100644
--- a/demos/qt3d/pageflip/pageflip.pro
+++ b/demos/qt3d/pageflip/pageflip.pro
@@ -1,43 +1,14 @@
 TEMPLATE = app
 TARGET = pageflip
 CONFIG += qt warn_on
+
 !package: CONFIG += qt3d
 
 SOURCES = pageflip.cpp pageflipmath.cpp
 HEADERS = pageflipmath_p.h
 RESOURCES = pageflip.qrc
 
-package {
-    maemo {
-        applnk.files = pageflip.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qt3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-    macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
-        LIBS += -framework Qt3D -F../../../src/threed
-        INCLUDEPATH += ../../../src/threed/Qt3D.framework/Versions/1/Headers
-    } else {
-        win32 {
-            CONFIG(debug, debug|release) {
-                TARGET = $$member(TARGET, 0)d
-                LIBS += ..\\..\\..\\src\\threed\\debug\\Qt3Dd.lib
-            } else {
-                LIBS += ..\\..\\..\\src\\threed\\release\\Qt3D.lib
-            }
-        } else {
-            LIBS += -L../../../src/threed -lQt3D
-        }
-        INCLUDEPATH += ../../../include/Qt3D
-    }
-    QT += opengl
-    target.path += $$[QT_INSTALL_BINS]
-    INSTALLS += target
-} else {
-    DESTDIR = ../../../bin
-}
+include(../../../qt3d_pkg_dep.pri)
 
 OTHER_FILES += \
     pageflip.rc
diff --git a/demos/qt3d/photobrowser3d/photobrowser3d.pro b/demos/qt3d/photobrowser3d/photobrowser3d.pro
index 36c0564a..26a5c0b4 100644
--- a/demos/qt3d/photobrowser3d/photobrowser3d.pro
+++ b/demos/qt3d/photobrowser3d/photobrowser3d.pro
@@ -1,6 +1,8 @@
 TEMPLATE = app
 TARGET = photobrowser3d
 CONFIG += qt warn_on
+
+include(../../../pkg.pri)
 !package: CONFIG += qt3d
 package: QT += opengl
 
@@ -54,37 +56,7 @@ OTHER_FILES += \
     shaders/replace_texture.fsh \
     shaders/replace_texture.vsh
 
-package {
-    maemo {
-        applnk.files = photobrowser3d.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qt3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-    macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
-        LIBS += -framework Qt3D -F../../../src/threed
-        INCLUDEPATH += ../../../src/threed/Qt3D.framework/Versions/1/Headers
-    } else {
-        win32 {
-            CONFIG(debug, debug|release) {
-                TARGET = $$member(TARGET, 0)d
-                LIBS += ..\\..\\..\\src\\threed\\debug\\Qt3Dd.lib
-            } else {
-                LIBS += ..\\..\\..\\src\\threed\\release\\Qt3D.lib
-            }
-        } else {
-            LIBS += -L../../../src/threed -lQt3D
-        }
-        INCLUDEPATH += ../../../include/Qt3D
-    }
-    QT += opengl
-    target.path += $$[QT_INSTALL_BINS]
-    INSTALLS += target
-} else {
-    DESTDIR = ../../../bin
-}
+include(../../../qt3d_pkg_dep.pri)
 
 symbian {
     symbian-abld|symbian-sbsv2 {
diff --git a/demos/qt3d/photobrowser3d/qfocusadaptor.cpp b/demos/qt3d/photobrowser3d/qfocusadaptor.cpp
index cf96f3a0..315086af 100644
--- a/demos/qt3d/photobrowser3d/qfocusadaptor.cpp
+++ b/demos/qt3d/photobrowser3d/qfocusadaptor.cpp
@@ -171,6 +171,7 @@ void QFocusAdaptor::calculateValues()
             qreal qw = (nearDist * sz.x()) / v.width();
 
             qreal q = qMax(qh, qw);
+            q = qMax(q, qreal(nearDist * 1.05));
 
             d->sourceCenter = cam->center();
             d->sourceEye = cam->eye();
diff --git a/demos/qt3d/shapes/shapes.pro b/demos/qt3d/shapes/shapes.pro
index 932c7840..804f22ba 100644
--- a/demos/qt3d/shapes/shapes.pro
+++ b/demos/qt3d/shapes/shapes.pro
@@ -5,37 +5,7 @@ CONFIG += qt warn_on
 
 SOURCES = shapes.cpp
 
-package {
-    maemo {
-        applnk.files = shapes.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qt3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-    macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
-        LIBS += -framework Qt3D -F../../../src/threed
-        INCLUDEPATH += ../../../src/threed/Qt3D.framework/Versions/1/Headers
-    } else {
-        win32 {
-            CONFIG(debug, debug|release) {
-                TARGET = $$member(TARGET, 0)d
-                LIBS += ..\\..\\..\\src\\threed\\debug\\Qt3Dd.lib
-            } else {
-                LIBS += ..\\..\\..\\src\\threed\\release\\Qt3D.lib
-            }
-        } else {
-            LIBS += -L../../../src/threed -lQt3D
-        }
-        INCLUDEPATH += ../../../include/Qt3D
-    }
-    QT += opengl
-    target.path += $$[QT_INSTALL_BINS]
-    INSTALLS += target
-} else {
-    DESTDIR = ../../../bin
-}
+include(../../../qt3d_pkg_dep.pri)
 
 OTHER_FILES += \
     shapes.rc
diff --git a/demos/qt3d/teaservice/teaservice.pro b/demos/qt3d/teaservice/teaservice.pro
index 7f292419..f54f3b51 100644
--- a/demos/qt3d/teaservice/teaservice.pro
+++ b/demos/qt3d/teaservice/teaservice.pro
@@ -1,43 +1,15 @@
 TEMPLATE = app
 TARGET = teaservice
 CONFIG += qt warn_on
+
+include(../../../pkg.pri)
 !package: CONFIG += qt3d
 
 SOURCES = teaservice.cpp meshobject.cpp sceneobject.cpp perpixeleffect.cpp
 HEADERS = meshobject.h sceneobject.h perpixeleffect.h
 RESOURCES = teaservice.qrc
 
-package {
-    maemo {
-        applnk.files = teaservice.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qt3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-    macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
-        LIBS += -framework Qt3D -F../../../src/threed
-        INCLUDEPATH += ../../../src/threed/Qt3D.framework/Versions/1/Headers
-    } else {
-        win32 {
-            CONFIG(debug, debug|release) {
-                TARGET = $$member(TARGET, 0)d
-                LIBS += ..\\..\\..\\src\\threed\\debug\\Qt3Dd.lib
-            } else {
-                LIBS += ..\\..\\..\\src\\threed\\release\\Qt3D.lib
-            }
-        } else {
-            LIBS += -L../../../src/threed -lQt3D
-        }
-        INCLUDEPATH += ../../../include/Qt3D
-    }
-    QT += opengl
-    target.path += $$[QT_INSTALL_BINS]
-    INSTALLS += target
-} else {
-    DESTDIR = ../../../bin
-}
+include(../../../qt3d_pkg_dep.pri)
 
 OTHER_FILES += \
     teaservice.rc
diff --git a/demos/quick3d/dirs b/demos/quick3d/dirs
deleted file mode 100644
index 576bd293..00000000
--- a/demos/quick3d/dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-robo_bounce
-tea_service
-model_viewer
diff --git a/demos/quick3d/model_viewer/model_viewer.pro b/demos/quick3d/model_viewer/model_viewer.pro
index 17c2994d..1d6d52a4 100644
--- a/demos/quick3d/model_viewer/model_viewer.pro
+++ b/demos/quick3d/model_viewer/model_viewer.pro
@@ -1,56 +1,12 @@
 TEMPLATE = app
 TARGET = model_viewer
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/demos/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/demos/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = model_viewer.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
 
 OTHER_FILES += \
     model_viewer.rc
diff --git a/demos/quick3d/robo_bounce/robo_bounce.pro b/demos/quick3d/robo_bounce/robo_bounce.pro
index 61a3c23d..a93711ae 100644
--- a/demos/quick3d/robo_bounce/robo_bounce.pro
+++ b/demos/quick3d/robo_bounce/robo_bounce.pro
@@ -1,32 +1,11 @@
 TEMPLATE = app
 TARGET = robo_bounce
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-package {
-    maemo {
-        applnk.files = robo_bounce.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
 
 OTHER_FILES += \
     robo_bounce.rc
diff --git a/demos/quick3d/tea_service/tea_service.pro b/demos/quick3d/tea_service/tea_service.pro
index 9baf03c5..f289699a 100644
--- a/demos/quick3d/tea_service/tea_service.pro
+++ b/demos/quick3d/tea_service/tea_service.pro
@@ -1,56 +1,12 @@
 TEMPLATE = app
 TARGET = tea_service
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/demos/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/demos/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = tea_service.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
 
 OTHER_FILES += \
     tea_service.rc
diff --git a/examples/qt3d/basket/basket.pro b/examples/qt3d/basket/basket.pro
index 650a5d12..750ee5e1 100644
--- a/examples/qt3d/basket/basket.pro
+++ b/examples/qt3d/basket/basket.pro
@@ -3,42 +3,12 @@ TARGET = basket
 CONFIG += qt warn_on
 !package: CONFIG += qt3d
 
+include(../../../qt3d_pkg_dep.pri)
+
 SOURCES = basketview.cpp main.cpp
 HEADERS = basketview.h basket_data.h
 RESOURCES = basket.qrc
 
-package {
-    maemo {
-        applnk.files = basket.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qt3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-    macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
-        LIBS += -framework Qt3D -F../../../src/threed
-        INCLUDEPATH += ../../../src/threed/Qt3D.framework/Versions/1/Headers
-    } else {
-        win32 {
-            CONFIG(debug, debug|release) {
-                TARGET = $$member(TARGET, 0)d
-                LIBS += ..\\..\\..\\src\\threed\\debug\\Qt3Dd.lib
-            } else {
-                LIBS += ..\\..\\..\\src\\threed\\release\\Qt3D.lib
-            }
-        } else {
-            LIBS += -L../../../src/threed -lQt3D
-        }
-        INCLUDEPATH += ../../../include/Qt3D
-    }
-    QT += opengl
-    target.path += $$[QT_INSTALL_BINS]
-    INSTALLS += target
-} else {
-    DESTDIR = ../../../bin
-}
-
 OTHER_FILES += \
     basket.rc
 
diff --git a/examples/qt3d/builder/builder.pro b/examples/qt3d/builder/builder.pro
index bf37619d..d06ffdfb 100644
--- a/examples/qt3d/builder/builder.pro
+++ b/examples/qt3d/builder/builder.pro
@@ -1,6 +1,7 @@
 TEMPLATE = app
 TARGET = builder
 CONFIG += qt warn_on
+
 !package: CONFIG += qt3d
 
 SOURCES = builder.cpp \
@@ -8,37 +9,7 @@ SOURCES = builder.cpp \
 HEADERS = builder.h
 RESOURCES += builder.qrc
 
-package {
-    maemo {
-        applnk.files = builder.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qt3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-    macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
-        LIBS += -framework Qt3D -F../../../src/threed
-        INCLUDEPATH += ../../../src/threed/Qt3D.framework/Versions/1/Headers
-    } else {
-        win32 {
-            CONFIG(debug, debug|release) {
-                TARGET = $$member(TARGET, 0)d
-                LIBS += ..\\..\\..\\src\\threed\\debug\\Qt3Dd.lib
-            } else {
-                LIBS += ..\\..\\..\\src\\threed\\release\\Qt3D.lib
-            }
-        } else {
-            LIBS += -L../../../src/threed -lQt3D
-        }
-        INCLUDEPATH += ../../../include/Qt3D
-    }
-    QT += opengl
-    target.path += $$[QT_INSTALL_BINS]
-    INSTALLS += target
-} else {
-    DESTDIR = ../../../bin
-}
+include(../../../qt3d_pkg_dep.pri)
 
 OTHER_FILES += \
     builder.rc
diff --git a/examples/qt3d/cube/cube.pro b/examples/qt3d/cube/cube.pro
index 3f6e3e68..7b2d2877 100644
--- a/examples/qt3d/cube/cube.pro
+++ b/examples/qt3d/cube/cube.pro
@@ -1,44 +1,13 @@
 TEMPLATE = app
 TARGET = cube
 CONFIG += qt warn_on
-
 !package: CONFIG += qt3d
 
 SOURCES = cubeview.cpp main.cpp
 HEADERS = cubeview.h
 RESOURCES = cube.qrc
 
-package {
-    maemo {
-        applnk.files = cube.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qt3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-    macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
-        LIBS += -framework Qt3D -F../../../src/threed
-        INCLUDEPATH += ../../../src/threed/Qt3D.framework/Versions/1/Headers
-    } else {
-        win32 {
-            CONFIG(debug, debug|release) {
-                TARGET = $$member(TARGET, 0)d
-                LIBS += ..\\..\\..\\src\\threed\\debug\\Qt3Dd.lib
-            } else {
-                LIBS += ..\\..\\..\\src\\threed\\release\\Qt3D.lib
-            }
-        } else {
-            LIBS += -L../../../src/threed -lQt3D
-        }
-        INCLUDEPATH += ../../../include/Qt3D
-    }
-    QT += opengl
-    target.path += $$[QT_INSTALL_BINS]
-    INSTALLS += target
-} else {
-    DESTDIR = ../../../bin
-}
+include(../../../qt3d_pkg_dep.pri)
 
 OTHER_FILES += \
     cube.rc
diff --git a/examples/qt3d/cylinder/cylinder.pro b/examples/qt3d/cylinder/cylinder.pro
index cee19d4e..a7e90f48 100644
--- a/examples/qt3d/cylinder/cylinder.pro
+++ b/examples/qt3d/cylinder/cylinder.pro
@@ -7,37 +7,7 @@ SOURCES = cylinderview.cpp main.cpp
 HEADERS = cylinderview.h
 RESOURCES = cylinder.qrc
 
-package {
-    maemo {
-        applnk.files = cylinder.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qt3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-    macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
-        LIBS += -framework Qt3D -F../../../src/threed
-        INCLUDEPATH += ../../../src/threed/Qt3D.framework/Versions/1/Headers
-    } else {
-        win32 {
-            CONFIG(debug, debug|release) {
-                TARGET = $$member(TARGET, 0)d
-                LIBS += ..\\..\\..\\src\\threed\\debug\\Qt3Dd.lib
-            } else {
-                LIBS += ..\\..\\..\\src\\threed\\release\\Qt3D.lib
-            }
-        } else {
-            LIBS += -L../../../src/threed -lQt3D
-        }
-        INCLUDEPATH += ../../../include/Qt3D
-    }
-    QT += opengl
-    target.path += $$[QT_INSTALL_BINS]
-    INSTALLS += target
-} else {
-    DESTDIR = ../../../bin
-}
+include(../../../qt3d_pkg_dep.pri)
 
 OTHER_FILES += \
     cylinder.rc
diff --git a/examples/qt3d/dirs b/examples/qt3d/dirs
deleted file mode 100644
index 8691f086..00000000
--- a/examples/qt3d/dirs
+++ /dev/null
@@ -1,9 +0,0 @@
-nesting
-builder
-tutorials
-graphicsview
-tank
-cube
-teapot
-cylinder
-geometry
diff --git a/examples/qt3d/geometry/geometry.pro b/examples/qt3d/geometry/geometry.pro
index 66a44052..66cbc948 100644
--- a/examples/qt3d/geometry/geometry.pro
+++ b/examples/qt3d/geometry/geometry.pro
@@ -1,7 +1,6 @@
 TEMPLATE = app
 TARGET = geometry
 CONFIG += qt warn_on
-
 !package: CONFIG += qt3d
 
 SOURCES = geometryview.cpp \
@@ -13,37 +12,7 @@ HEADERS = geometryview.h \
     quadplane.h
 RESOURCES = geometry.qrc
 
-package {
-    maemo {
-        applnk.files = geometry.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qt3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-    macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
-        LIBS += -framework Qt3D -F../../../src/threed
-        INCLUDEPATH += ../../../src/threed/Qt3D.framework/Versions/1/Headers
-    } else {
-        win32 {
-            CONFIG(debug, debug|release) {
-                TARGET = $$member(TARGET, 0)d
-                LIBS += ..\\..\\..\\src\\threed\\debug\\Qt3Dd.lib
-            } else {
-                LIBS += ..\\..\\..\\src\\threed\\release\\Qt3D.lib
-            }
-        } else {
-            LIBS += -L../../../src/threed -lQt3D
-        }
-        INCLUDEPATH += ../../../include/Qt3D
-    }
-    QT += opengl
-    target.path += $$[QT_INSTALL_BINS]
-    INSTALLS += target
-} else {
-    DESTDIR = ../../../bin
-}
+include(../../../qt3d_pkg_dep.pri)
 
 OTHER_FILES += \
     geometry.rc
diff --git a/examples/qt3d/graphicsview/graphicsview.pro b/examples/qt3d/graphicsview/graphicsview.pro
index f56ba56c..758957e6 100644
--- a/examples/qt3d/graphicsview/graphicsview.pro
+++ b/examples/qt3d/graphicsview/graphicsview.pro
@@ -26,37 +26,7 @@ HEADERS = \
 RESOURCES = \
     graphicsview.qrc
 
-package {
-    maemo {
-        applnk.files = graphicsview.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qt3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-    macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
-        LIBS += -framework Qt3D -F../../../src/threed
-        INCLUDEPATH += ../../../src/threed/Qt3D.framework/Versions/1/Headers
-    } else {
-        win32 {
-            CONFIG(debug, debug|release) {
-                TARGET = $$member(TARGET, 0)d
-                LIBS += ..\\..\\..\\src\\threed\\debug\\Qt3Dd.lib
-            } else {
-                LIBS += ..\\..\\..\\src\\threed\\release\\Qt3D.lib
-            }
-        } else {
-            LIBS += -L../../../src/threed -lQt3D
-        }
-        INCLUDEPATH += ../../../include/Qt3D
-    }
-    QT += opengl
-    target.path += $$[QT_INSTALL_BINS]
-    INSTALLS += target
-} else {
-    DESTDIR = ../../../bin
-}
+include(../../../qt3d_pkg_dep.pri)
 
 OTHER_FILES += \
     graphicsview.rc
diff --git a/examples/qt3d/nesting/nesting.pro b/examples/qt3d/nesting/nesting.pro
index aaf9638d..f1b17970 100644
--- a/examples/qt3d/nesting/nesting.pro
+++ b/examples/qt3d/nesting/nesting.pro
@@ -7,37 +7,7 @@ SOURCES = cubeview.cpp main.cpp
 HEADERS = cubeview.h
 RESOURCES = nesting.qrc
 
-package {
-    maemo {
-        applnk.files = nesting.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qt3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-    macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
-        LIBS += -framework Qt3D -F../../../src/threed
-        INCLUDEPATH += ../../../src/threed/Qt3D.framework/Versions/1/Headers
-    } else {
-        win32 {
-            CONFIG(debug, debug|release) {
-                TARGET = $$member(TARGET, 0)d
-                LIBS += ..\\..\\..\\src\\threed\\debug\\Qt3Dd.lib
-            } else {
-                LIBS += ..\\..\\..\\src\\threed\\release\\Qt3D.lib
-            }
-        } else {
-            LIBS += -L../../../src/threed -lQt3D
-        }
-        INCLUDEPATH += ../../../include/Qt3D
-    }
-    QT += opengl
-    target.path += $$[QT_INSTALL_BINS]
-    INSTALLS += target
-} else {
-    DESTDIR = ../../../bin
-}
+include(../../../qt3d_pkg_dep.pri)
 
 OTHER_FILES += \
     nesting.rc
diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro
index bd556b28..07b7c8dc 100644
--- a/examples/qt3d/qt3d.pro
+++ b/examples/qt3d/qt3d.pro
@@ -1,3 +1,2 @@
 TEMPLATE = subdirs
 SUBDIRS += basket builder cube cylinder geometry graphicsview nesting solarsystem tank teapot
-!package: SUBDIRS += tutorials
diff --git a/examples/qt3d/solarsystem/m5-solarsystem.desktop b/examples/qt3d/solarsystem/m5-solarsystem.desktop
new file mode 100644
index 00000000..b2dff71a
--- /dev/null
+++ b/examples/qt3d/solarsystem/m5-solarsystem.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Name=Basket
+Comment=Qt3D example application
+Exec=/usr/bin/basket -fullscreen
+Icon=icon-l-qt3d
+Terminal=false
+Type=Application
+Categories=Development;
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable
+X-Text-Domain=qt3d
+
diff --git a/examples/qt3d/solarsystem/solarsystem.desktop b/examples/qt3d/solarsystem/solarsystem.desktop
new file mode 100644
index 00000000..c64ec3dc
--- /dev/null
+++ b/examples/qt3d/solarsystem/solarsystem.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Basket
+Icon=icon-l-qt3d
+Exec=/usr/bin/basket -fullscreen
+OnlyShowIn=X-MeeGo;
+X-MeeGo-Logical-Id=qtn_comm_appname_basket
+X-MeeGo-Translation-Catalog=essentials
diff --git a/examples/qt3d/solarsystem/solarsystem.pro b/examples/qt3d/solarsystem/solarsystem.pro
index d2f8cb24..71e9e595 100644
--- a/examples/qt3d/solarsystem/solarsystem.pro
+++ b/examples/qt3d/solarsystem/solarsystem.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = solarsystem
 CONFIG += qt warn_on
-CONFIG += qt3d
+!package: CONFIG += qt3d
 
 SOURCES = solarsystem.cpp \
     main.cpp
@@ -9,37 +9,7 @@ HEADERS = solarsystem.h
 RESOURCES += solarsystem.qrc
 DEPENDPATH += resources
 
-package {
-    maemo {
-        applnk.files = builder.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qt3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-    macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
-        LIBS += -framework Qt3D -F../../../src/threed
-        INCLUDEPATH += ../../../src/threed/Qt3D.framework/Versions/1/Headers
-    } else {
-        win32 {
-            CONFIG(debug, debug|release) {
-                TARGET = $$member(TARGET, 0)d
-                LIBS += ..\\..\\..\\src\\threed\\debug\\Qt3Dd.lib
-            } else {
-                LIBS += ..\\..\\..\\src\\threed\\release\\Qt3D.lib
-            }
-        } else {
-            LIBS += -L../../../src/threed -lQt3D
-        }
-        INCLUDEPATH += ../../../include/Qt3D
-    }
-    QT += opengl
-    target.path += $$[QT_INSTALL_BINS]
-    INSTALLS += target
-} else {
-    DESTDIR = ../../../bin
-}
+include(../../../qt3d_pkg_dep.pri)
 
 OTHER_FILES += \
     resources/moon-texture.jpg \
diff --git a/examples/qt3d/tank/tank.pro b/examples/qt3d/tank/tank.pro
index 98055814..1f1daef2 100644
--- a/examples/qt3d/tank/tank.pro
+++ b/examples/qt3d/tank/tank.pro
@@ -12,37 +12,7 @@ HEADERS  += tankview.h \
     tank.h \
     quadplane.h
 
-package {
-    maemo {
-        applnk.files = tank.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qt3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-    macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
-        LIBS += -framework Qt3D -F../../../src/threed
-        INCLUDEPATH += ../../../src/threed/Qt3D.framework/Versions/1/Headers
-    } else {
-        win32 {
-            CONFIG(debug, debug|release) {
-                TARGET = $$member(TARGET, 0)d
-                LIBS += ..\\..\\..\\src\\threed\\debug\\Qt3Dd.lib
-            } else {
-                LIBS += ..\\..\\..\\src\\threed\\release\\Qt3D.lib
-            }
-        } else {
-            LIBS += -L../../../src/threed -lQt3D
-        }
-        INCLUDEPATH += ../../../include/Qt3D
-    }
-    QT += opengl
-    target.path += $$[QT_INSTALL_BINS]
-    INSTALLS += target
-} else {
-    DESTDIR = ../../../bin
-}
+include(../../../qt3d_pkg_dep.pri)
 
 OTHER_FILES += \
     tank.rc
diff --git a/examples/qt3d/teapot/teapot.pro b/examples/qt3d/teapot/teapot.pro
index 8353c487..dbd8de35 100644
--- a/examples/qt3d/teapot/teapot.pro
+++ b/examples/qt3d/teapot/teapot.pro
@@ -6,37 +6,7 @@ CONFIG += qt warn_on
 SOURCES = teapotview.cpp main.cpp
 HEADERS = teapotview.h
 
-package {
-    maemo {
-        applnk.files = teapot.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qt3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-    macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
-        LIBS += -framework Qt3D -F../../../src/threed
-        INCLUDEPATH += ../../../src/threed/Qt3D.framework/Versions/1/Headers
-    } else {
-        win32 {
-            CONFIG(debug, debug|release) {
-                TARGET = $$member(TARGET, 0)d
-                LIBS += ..\\..\\..\\src\\threed\\debug\\Qt3Dd.lib
-            } else {
-                LIBS += ..\\..\\..\\src\\threed\\release\\Qt3D.lib
-            }
-        } else {
-            LIBS += -L../../../src/threed -lQt3D
-        }
-        INCLUDEPATH += ../../../include/Qt3D
-    }
-    QT += opengl
-    target.path += $$[QT_INSTALL_BINS]
-    INSTALLS += target
-} else {
-    DESTDIR = ../../../bin
-}
+include(../../../qt3d_pkg_dep.pri)
 
 OTHER_FILES += \
     teapot.rc
diff --git a/examples/quick3d/basket/basket.pro b/examples/quick3d/basket/basket.pro
index 4eb70047..4ebc0c05 100644
--- a/examples/quick3d/basket/basket.pro
+++ b/examples/quick3d/basket/basket.pro
@@ -1,32 +1,12 @@
 TEMPLATE = app
 TARGET = basket_qml
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-package {
-    maemo {
-        applnk.files = basket_qml.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
 
 OTHER_FILES += \
     basket_qml.rc
diff --git a/examples/quick3d/cube/cube.pro b/examples/quick3d/cube/cube.pro
index bbd549bf..1ac7a469 100644
--- a/examples/quick3d/cube/cube.pro
+++ b/examples/quick3d/cube/cube.pro
@@ -1,56 +1,12 @@
 TEMPLATE = app
 TARGET = cube_qml
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/examples/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/examples/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = cube_qml.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
 
 OTHER_FILES += \
     cube_qml.rc
diff --git a/examples/quick3d/forest/forest.pro b/examples/quick3d/forest/forest.pro
index 6ca39008..6d78ecbf 100644
--- a/examples/quick3d/forest/forest.pro
+++ b/examples/quick3d/forest/forest.pro
@@ -1,56 +1,12 @@
 TEMPLATE = app
 TARGET = forest_qml
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/examples/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/examples/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = forest.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
 
 OTHER_FILES += \
     forest.rc
diff --git a/examples/quick3d/lander/lander.pro b/examples/quick3d/lander/lander.pro
index f1069ed3..f9eb251d 100644
--- a/examples/quick3d/lander/lander.pro
+++ b/examples/quick3d/lander/lander.pro
@@ -1,56 +1,12 @@
 TEMPLATE = app
 TARGET = lander
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/examples/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/examples/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = lander.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
 
 OTHER_FILES += \
     lander.rc
diff --git a/examples/quick3d/matrix_animation/matrix_animation.pro b/examples/quick3d/matrix_animation/matrix_animation.pro
index c9cedf15..1715d561 100644
--- a/examples/quick3d/matrix_animation/matrix_animation.pro
+++ b/examples/quick3d/matrix_animation/matrix_animation.pro
@@ -1,56 +1,12 @@
 TEMPLATE = app
 TARGET = matrix_animation
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/examples/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/examples/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = matrix_animation.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
 
 OTHER_FILES += \
     matrix_animation.rc
diff --git a/examples/quick3d/monkeygod/monkeygod.pro b/examples/quick3d/monkeygod/monkeygod.pro
index e68dba7d..9bf5b82f 100644
--- a/examples/quick3d/monkeygod/monkeygod.pro
+++ b/examples/quick3d/monkeygod/monkeygod.pro
@@ -1,56 +1,12 @@
 TEMPLATE = app
 TARGET = monkeygod
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/examples/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/examples/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = monkeygod.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
 
 OTHER_FILES += \
     monkeygod.rc
diff --git a/examples/quick3d/moon/moon.pro b/examples/quick3d/moon/moon.pro
index ebed2ead..a5e81a53 100644
--- a/examples/quick3d/moon/moon.pro
+++ b/examples/quick3d/moon/moon.pro
@@ -1,56 +1,12 @@
 TEMPLATE = app
 TARGET = moon
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/examples/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/examples/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = moon.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
 
 OTHER_FILES += \
     moon.rc
diff --git a/examples/quick3d/photoroom/photoroom.pro b/examples/quick3d/photoroom/photoroom.pro
index 2477cc48..a352d190 100644
--- a/examples/quick3d/photoroom/photoroom.pro
+++ b/examples/quick3d/photoroom/photoroom.pro
@@ -1,56 +1,12 @@
 TEMPLATE = app
 TARGET = photoroom
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/examples/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/examples/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = photoroom.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
 
 OTHER_FILES += \
     photoroom.rc
diff --git a/examples/quick3d/quick3d.pro b/examples/quick3d/quick3d.pro
index b17cf7fb..d95070cc 100644
--- a/examples/quick3d/quick3d.pro
+++ b/examples/quick3d/quick3d.pro
@@ -9,6 +9,4 @@ SUBDIRS += \
     moon \
     photoroom \
     shaders \
-    sphere \
-    tutorials
-
+    sphere
diff --git a/examples/quick3d/shaders/shaders.pro b/examples/quick3d/shaders/shaders.pro
index 2d0551ad..5dd55aa9 100644
--- a/examples/quick3d/shaders/shaders.pro
+++ b/examples/quick3d/shaders/shaders.pro
@@ -1,56 +1,12 @@
 TEMPLATE = app
 TARGET = shaders
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/examples/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/examples/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = shaders.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
 
 OTHER_FILES += \
     shaders.rc
diff --git a/examples/quick3d/sphere/sphere.pro b/examples/quick3d/sphere/sphere.pro
index 6c29f37d..4d0278c6 100644
--- a/examples/quick3d/sphere/sphere.pro
+++ b/examples/quick3d/sphere/sphere.pro
@@ -1,56 +1,12 @@
 TEMPLATE = app
 TARGET = sphere
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/examples/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/examples/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = sphere.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
 
 OTHER_FILES += \
     sphere.rc
diff --git a/examples/quick3d/tutorials/shaders/textures/basket.jpg b/examples/quick3d/tutorials/shaders/textures/basket.jpg
deleted file mode 100644
index 438e7a0c..00000000
--- a/examples/quick3d/tutorials/shaders/textures/basket.jpg
+++ /dev/null
diff --git a/examples/quick3d/tutorials/shaders/textures/qtlogo.png b/examples/quick3d/tutorials/shaders/textures/qtlogo.png
deleted file mode 100644
index 7d3e97eb..00000000
--- a/examples/quick3d/tutorials/shaders/textures/qtlogo.png
+++ /dev/null
diff --git a/examples/quick3d/tutorials/teapot_bounce_qml/icon-l-qtquick3d.png b/examples/quick3d/tutorials/teapot_bounce_qml/icon-l-qtquick3d.png
deleted file mode 100644
index 69deef3f..00000000
--- a/examples/quick3d/tutorials/teapot_bounce_qml/icon-l-qtquick3d.png
+++ /dev/null
diff --git a/examples/quick3d/tutorials/teapot_bounce_qml/qtquick3d.ico b/examples/quick3d/tutorials/teapot_bounce_qml/qtquick3d.ico
deleted file mode 100644
index b3b85e37..00000000
--- a/examples/quick3d/tutorials/teapot_bounce_qml/qtquick3d.ico
+++ /dev/null
diff --git a/examples/quick3d/tutorials/teapot_bounce_qml/teapot_bounce_qml.pro b/examples/quick3d/tutorials/teapot_bounce_qml/teapot_bounce_qml.pro
deleted file mode 100644
index c2537cce..00000000
--- a/examples/quick3d/tutorials/teapot_bounce_qml/teapot_bounce_qml.pro
+++ /dev/null
@@ -1,58 +0,0 @@
-TEMPLATE = app
-TARGET = teapot_bounce_qml
-CONFIG += qt warn_on
-
-SOURCES += main.cpp
-HEADERS += ../../qmlres.h
-
-QT += declarative
-
-!package:DESTDIR = ../../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../../bin/resources/examples/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/examples/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = teapot_bounce_qml.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
-
-OTHER_FILES += \
-    teapot_bounce_qml.rc
-
-RC_FILE = teapot_bounce_qml.rc
diff --git a/examples/quick3d/tutorials/teapot_qml/icon-l-qtquick3d.png b/examples/quick3d/tutorials/teapot_qml/icon-l-qtquick3d.png
deleted file mode 100644
index 69deef3f..00000000
--- a/examples/quick3d/tutorials/teapot_qml/icon-l-qtquick3d.png
+++ /dev/null
diff --git a/examples/quick3d/tutorials/teapot_qml/qtquick3d.ico b/examples/quick3d/tutorials/teapot_qml/qtquick3d.ico
deleted file mode 100644
index b3b85e37..00000000
--- a/examples/quick3d/tutorials/teapot_qml/qtquick3d.ico
+++ /dev/null
diff --git a/examples/quick3d/tutorials/teapot_qml/teapot_qml.pro b/examples/quick3d/tutorials/teapot_qml/teapot_qml.pro
deleted file mode 100644
index a8f472fc..00000000
--- a/examples/quick3d/tutorials/teapot_qml/teapot_qml.pro
+++ /dev/null
@@ -1,58 +0,0 @@
-TEMPLATE = app
-TARGET = teapot_qml
-CONFIG += qt warn_on
-
-SOURCES += main.cpp
-HEADERS += ../../qmlres.h
-
-QT += declarative
-
-!package:DESTDIR = ../../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../../bin/resources/examples/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/examples/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = teapot_qml.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
-
-OTHER_FILES += \
-    teapot_qml.rc
-
-RC_FILE = teapot_qml.rc
diff --git a/examples/quick3d/tutorials/tutorials.pro b/examples/quick3d/tutorials/tutorials.pro
deleted file mode 100644
index 7c14e1ea..00000000
--- a/examples/quick3d/tutorials/tutorials.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += \
-    teapot_qml teapot_bounce_qml
diff --git a/pkg.pri b/pkg.pri
new file mode 100644
index 00000000..0ac19123
--- /dev/null
+++ b/pkg.pri
@@ -0,0 +1,54 @@
+!CONFIG(pkg_pri_included) {
+CONFIG+=pkg_pri_included
+
+# Config for making example and demo apps packageable
+
+# Note that the paths here all assumed the including .pro file
+# is exactly 3 levels of directory tree below the root
+
+# Include this file after qt3d_pkg_dep.pri or qt3dquick_pkg_dep.pri
+
+qtc_harmattan {
+    CONFIG += maemo
+    CONFIG += package
+    # The Qt SDK / Qt Creator harmattan integration needs some special treatment
+    QT3D_INSTALL_BINS = /bin
+    QT3D_INSTALL_LIBS = /usr/lib
+    QT3D_INSTALL_PLUGINS = /usr/lib/qt4/plugins
+    QT3D_INSTALL_IMPORTS = /usr/lib/qt4/imports
+    QT3D_INSTALL_DATA = /usr/share/qt4
+} else {
+    QT3D_INSTALL_BINS = $$[QT_INSTALL_BINS]
+    QT3D_INSTALL_LIBS = $$[QT_INSTALL_LIBS]
+    QT3D_INSTALL_PLUGINS = $$[QT_INSTALL_PLUGINS]
+    QT3D_INSTALL_IMPORTS = $$[QT_INSTALL_IMPORTS]
+    QT3D_INSTALL_DATA = $$[QT_INSTALL_DATA]
+}
+
+contains(TEMPLATE, app) {
+    package  {
+        maemo {
+            applnk.files = $${TARGET}.desktop
+            applnk.path = /usr/share/applications
+
+            # icons.files is set by qt3dquick_pkg_dep.pri or qt3d_pkg_dep.pri
+            icons.path = /usr/share/themes/base/meegotouch/icons
+            INSTALLS += icons applnk
+        }
+        target.path += $$QT3D_INSTALL_BINS
+        INSTALLS += target
+    } else {
+        DESTDIR = ../../../bin
+    }
+    symbian {
+        vendorinfo = \
+         "%{\"NOKIA\"}" \
+         ":\"NOKIA\""
+
+        my_deployment.pkg_prerules = vendorinfo
+        DEPLOYMENT += my_deployment
+
+        ICON = ../qt3d.svg
+    }
+}
+}
diff --git a/qml_pkg.pri b/qml_pkg.pri
new file mode 100644
index 00000000..0cf7e6e0
--- /dev/null
+++ b/qml_pkg.pri
@@ -0,0 +1,32 @@
+# Manages deploying the QML files and resources along with the binary
+
+distInstalls.files = qml
+distInstalls.path = $$QT3D_INSTALL_DATA/quick3d/examples/$$TARGET
+INSTALLS += distInstalls
+
+win32 {
+    QMAKE_DEL_FILE = del /q
+    QMAKE_DEL_DIR = rmdir /s /q
+}
+
+qmlResources.files = qml
+symbian {
+    DEPLOYMENT += qmlResources
+    qmlDeployment.sources = qml\*
+    qmlDeployment.path = qml
+    DEPLOYMENT += qmlDeployment
+} else {
+    macx {
+        qmlResources.path = Contents/Resources
+        QMAKE_BUNDLE_DATA += qmlResources
+    } else {
+        !package {
+            qmlResources.input = qmlResources.files
+            qmlResources.output = $$OUT_PWD/../../../bin/resources/examples/$$TARGET/qml
+            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+            qmlResources.CONFIG += no_link_no_clean
+            qmlResources.variable_out = POST_TARGETDEPS
+            QMAKE_EXTRA_COMPILERS += qmlResources
+        }
+    }
+}
diff --git a/qt3d_pkg_dep.pri b/qt3d_pkg_dep.pri
new file mode 100644
index 00000000..4c1c2c7a
--- /dev/null
+++ b/qt3d_pkg_dep.pri
@@ -0,0 +1,27 @@
+# See README for an explanation of package build mode
+# Note that the paths here all assumed the including .pro file
+# is exactly 3 levels of directory tree below the root
+
+# Include this file before pkg.pri
+
+package {
+    macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
+        LIBS += -framework Qt3D -F../../../src/threed
+        INCLUDEPATH += ../../../src/threed/Qt3D.framework/Versions/1/Headers
+    } else {
+        win32 {
+            CONFIG(debug, debug|release) {
+                TARGET = $$member(TARGET, 0)d
+                LIBS += ..\\..\\..\\src\\threed\\debug\\Qt3Dd.lib
+            } else {
+                LIBS += ..\\..\\..\\src\\threed\\release\\Qt3D.lib
+            }
+        } else {
+            LIBS += -L../../../src/threed -lQt3D
+        }
+        INCLUDEPATH += ../../../include/Qt3D
+    }
+    QT += opengl
+}
+
+include(pkg.pri)
diff --git a/qt3dquick_pkg_dep.pri b/qt3dquick_pkg_dep.pri
new file mode 100644
index 00000000..32f37be8
--- /dev/null
+++ b/qt3dquick_pkg_dep.pri
@@ -0,0 +1,33 @@
+# See README for an explanation of package build mode
+# Note that the paths here all assumed the including .pro file
+# is exactly 3 levels of directory tree below the root
+
+package {
+    macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
+        LIBS += -framework Qt3DQuick -F../../../src/quick3d
+        INCLUDEPATH += ../../../src/quick3d/Qt3DQuick.framework/Versions/1/Headers
+    } else {
+        win32 {
+            CONFIG(debug, debug|release) {
+                TARGET = $$member(TARGET, 0)d
+                LIBS += ..\\..\\..\\src\\quick3d\\debug\\Qt3DQuickd.lib
+            } else {
+                LIBS += ..\\..\\..\\src\\quick3d\\release\\Qt3DQuick.lib
+            }
+        } else {
+            LIBS += -L../../../src/quick3d -lQt3DQuick
+        }
+        INCLUDEPATH += ../../../include/Qt3DQuick
+    }
+    QT += declarative opengl
+
+    maemo: icons.files = icon-l-qtquick3d.png
+}
+
+include(qt3d_pkg_dep.pri)
+
+symbian {
+    ICON = ../qtquick3d.svg
+}
+
+include(pkg.pri)
diff --git a/qtc_packaging/debian_harmattan/README b/qtc_packaging/debian_harmattan/README
new file mode 100644
index 00000000..b21b46df
--- /dev/null
+++ b/qtc_packaging/debian_harmattan/README
@@ -0,0 +1,95 @@
+This is the Qt Quick 3D project:
+   * QtQuick3D QML bindings and
+   * Qt3D C++ APIs
+
+
+Building QtQuick3D
+==================
+
+Check the building instructions in doc/src/qt3d-building.qdoc also available
+online at: http://doc.qt.nokia.com/qt-quick3d-snapshot/qt3d-building.html
+
+
+Whats in QtQuick3D
+==================
+
+Directory structure:
+
+src/threed/
+    This is the main library of the Qt3D project, containing abstractions
+    for cross-platform GL, shaders, lighting models, and so on.
+src/plugins/
+    Scene format loading plugins.
+src/imports/
+    QML import plugins.
+util/
+    Various utilities that are useful when working with Qt3D.
+examples/
+    Some examples of using QtQuick3D (QML bindings) and Qt3D (C++ API).
+demos/
+    Some more complex demos of using QtQuiick3D (QML bindings) and Qt3D (C++ API).
+tests/auto/qml3d/
+    Unit tests for the QtQuick3D bindings.
+tests/auto/threed/
+    Unit tests for the Qt3D C++ API
+doc/
+    Documentation.
+devices/symbian/
+    Symbian deployment file
+
+
+Documentation
+=============
+
+The documentation can be generated with "make docs".  It will be placed
+into "doc/html" in the build directory.
+
+
+Packages
+========
+
+This section is only for those developing QtQuick3D.  Read on to discover how
+the building of packages works.  This section is also important if you want to
+change how the structure of the QtQuick3D pro files work.
+
+QtQuick3D is intended to be built in one of two ways:
+
+1) Normal developer way:
+        qmake && make
+2) Package creation way:
+        qmake CONFIG+=package && INSTALL_ROOT=tmp make install
+
+In 1) the .pro files will cause the toolchain to place the libraries, plugins
+header files and other components of QtQuick3D directly into place, as part of
+the compile process.  What does "in place" mean?  Run "qmake -query" to see
+the paths where the files are placed - QML plugins go in $$[QT_INSTALL_IMPORTS]
+for example.  In this mode, there is no need to run "make install" because the
+files are already in their target destination.  Here the "target destination"
+means the Qt which is being built against.
+
+First note that QtQuick3D has to be installed into the target Qt.  This is because
+QtQuick3D has QML plugins and resources, as well as shared libraries, all of which
+must be resolved by the QMLViewer of the target Qt at runtime.  Here where "qmake"
+is referred to it means the qmake inside the target Qt.  Since QtDeclarative
+recommends using QMLViewer when developing and debugging QML Apps, in the developer
+case - which is what Qt3D is for - it has to install directly into the target Qt.
+
+In this mode 1) after the main library is compiled subsequent targets can simply
+resolve includes and link time dependencies by use of qt3d.prf and qtquick3d.prf.
+These two files are installed into the target Qt's makespecs/features directory
+during the processing of the quick3d.pro file.
+
+In 2) the libraries, plugins and so on are sitting inside the build tree after
+the compile step.  As a result in order to resolve includes and dependencies
+the build system has to navigate the build tree with paths like "-L../../../threed"
+to locate the Qt3D libraries.
+
+Actually there is one build artifact that is not just left where it lands in the
+build tree - the header files.  These are actually copied into an "include"
+directory inside the build root directory.  This is because at present the header
+files all live inside their own seperate subdirectories under "threed" and would
+be too cumbersome to path in explicitly.
+
+After building the tree the install step is invoked using the INSTALL_ROOT environment
+export to cause the installation rules to place all the files into a sandboxed
+install tree, ready for packaging.
diff --git a/qtc_packaging/debian_harmattan/changelog b/qtc_packaging/debian_harmattan/changelog
new file mode 100644
index 00000000..9829c5d5
--- /dev/null
+++ b/qtc_packaging/debian_harmattan/changelog
@@ -0,0 +1,5 @@
+quick3d (0.0.1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- unknown <sarasmit@unknown>  Wed, 29 Jun 2011 16:52:34 +1000
diff --git a/qtc_packaging/debian_harmattan/changelog.old b/qtc_packaging/debian_harmattan/changelog.old
new file mode 100644
index 00000000..3a4ac83d
--- /dev/null
+++ b/qtc_packaging/debian_harmattan/changelog.old
@@ -0,0 +1,5 @@
+libqt4-3d (1.0-tp1) unstable; urgency=low
+
+  * Technology Preview 1 Release.
+
+ -- Sarah Smith <sarah.j.smith@nokia.com>  Wed, 06 Apr 2011 16:30:00 +1000
diff --git a/qtc_packaging/debian_harmattan/compat b/qtc_packaging/debian_harmattan/compat
new file mode 100644
index 00000000..7f8f011e
--- /dev/null
+++ b/qtc_packaging/debian_harmattan/compat
@@ -0,0 +1 @@
+7
diff --git a/qtc_packaging/debian_harmattan/control b/qtc_packaging/debian_harmattan/control
new file mode 100644
index 00000000..b6ef3409
--- /dev/null
+++ b/qtc_packaging/debian_harmattan/control
@@ -0,0 +1,14 @@
+Source: quick3d
+Section: user/other
+Priority: optional
+Maintainer: Sarah Smith <sarah.j.smith@nokia.com>
+Build-Depends: debhelper (>= 5), libqt4-dev
+Standards-Version: 3.7.3
+Homepage: http://doc.qt.nokia.com/qt-quick3d-snapshot/
+
+Package: quick3d
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: <insert up to 60 chars description>
+ Qt Quick 3D lets you use QML to write 3D (OpenGL) apps.
+XSBC-Maemo-Display-Name: quick3d
diff --git a/qtc_packaging/debian_harmattan/control.old b/qtc_packaging/debian_harmattan/control.old
new file mode 100644
index 00000000..7d969ded
--- /dev/null
+++ b/qtc_packaging/debian_harmattan/control.old
@@ -0,0 +1,33 @@
+Source: libqt4-3d
+Section: libdevel
+Priority: extra
+Maintainer: Sarah Smith <sarah.j.smith@nokia.com>
+Build-Depends: debhelper (>= 7), libqt4-dev (>= 4.7.2~git20110208-0maemo1+0m6), cdbs (>= 0.4.87+maemo2+0m6)
+Standards-Version: 3.8.4
+
+Package: libqt4-3d
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Qt4 3D module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ The Qt3d module contains functionality for 3D scenes and UIs.
+
+Package: libqt4-3d-examples
+Architecture: any
+Depends: libqt4-3d (= ${binary:Version})
+Description: Qt 4 3d module examples
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains examples and demos for the Qt3d module
+
+Package: libqt4-3d-dev
+Architecture: any
+Depends: libqt4-3d (= ${binary:Version})
+Description: Qt 4 3d module development files
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the development headers for the Qt3d module
diff --git a/qtc_packaging/debian_harmattan/copyright b/qtc_packaging/debian_harmattan/copyright
new file mode 100644
index 00000000..a54c00e4
--- /dev/null
+++ b/qtc_packaging/debian_harmattan/copyright
@@ -0,0 +1,22 @@
+Nokia Qt LGPL Exception version 1.1
+
+As an additional permission to the GNU Lesser General Public License version
+2.1, the object code form of a "work that uses the Library" may incorporate
+material from a header file that is part of the Library.  You may distribute
+such object code under terms of your choice, provided that:
+    (i)   the header files of the Library have not been modified; and
+    (ii)  the incorporated material is limited to numerical parameters, data
+          structure layouts, accessors, macros, inline functions and
+          templates; and
+    (iii) you comply with the terms of Section 6 of the GNU Lesser General
+          Public License version 2.1.
+
+Moreover, you may apply this exception to a modified version of the Library,
+provided that such modification does not involve copying material from the
+Library into the modified Library's header files unless such material is
+limited to (i) numerical parameters; (ii) data structure layouts;
+(iii) accessors; and (iv) small macros, templates and inline functions of
+five lines or less in length.
+
+Furthermore, you are not required to apply this additional permission to a
+modified version of the Library.
diff --git a/qtc_packaging/debian_harmattan/libqt4-3d-dev.install b/qtc_packaging/debian_harmattan/libqt4-3d-dev.install
new file mode 100644
index 00000000..aef1dfd0
--- /dev/null
+++ b/qtc_packaging/debian_harmattan/libqt4-3d-dev.install
@@ -0,0 +1,2 @@
+usr/share/qt4/mkspecs/features/
+usr/include/qt4/Qt3D/
diff --git a/qtc_packaging/debian_harmattan/libqt4-3d-examples.install b/qtc_packaging/debian_harmattan/libqt4-3d-examples.install
new file mode 100644
index 00000000..9bc01a58
--- /dev/null
+++ b/qtc_packaging/debian_harmattan/libqt4-3d-examples.install
@@ -0,0 +1,4 @@
+usr/bin/*
+usr/share/qt4/quick3d
+usr/share/themes/base/meegotouch/icons
+usr/share/applications
diff --git a/qtc_packaging/debian_harmattan/libqt4-3d.install b/qtc_packaging/debian_harmattan/libqt4-3d.install
new file mode 100644
index 00000000..d650a0c8
--- /dev/null
+++ b/qtc_packaging/debian_harmattan/libqt4-3d.install
@@ -0,0 +1,4 @@
+usr/lib/libQt3D.so.*
+usr/lib/libQt3DQuick.so.*
+usr/lib/qt4/plugins/
+usr/lib/qt4/imports/
diff --git a/qtc_packaging/debian_harmattan/rules b/qtc_packaging/debian_harmattan/rules
new file mode 100644
index 00000000..b9f7b7dc
--- /dev/null
+++ b/qtc_packaging/debian_harmattan/rules
@@ -0,0 +1,86 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# qmake PREFIX=/usr# Uncomment this line for use without Qt Creator
+
+	touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp: configure-stamp  
+	dh_testdir
+
+	# Add here commands to compile the package.
+	# $(MAKE) # Uncomment this line for use without Qt Creator
+	#docbook-to-man debian/quick3d.sgml > quick3d.1
+
+	touch $@
+
+clean: 
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+	$(MAKE) clean
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	# Add here commands to install the package into debian/quick3d.
+	$(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/quick3d install
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs
+	dh_installexamples
+#	dh_install
+#	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_python
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_makeshlibs
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/qtc_packaging/debian_harmattan/rules.old b/qtc_packaging/debian_harmattan/rules.old
new file mode 100644
index 00000000..af94d53f
--- /dev/null
+++ b/qtc_packaging/debian_harmattan/rules.old
@@ -0,0 +1,47 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# This rules file is for new Nokia devices using maemo6/meego.
+# For fremantle / N900 see the file devices/maemo5/debian/rules.
+# For ubuntu desktop see the file devices/ubuntu/debian/rules.
+
+# To build using this rules file:
+# #
+# ### install debian packaging stuff if not already present:
+# sudo apt-get install dpkg-dev debhelper cdbs
+#
+# ### set up the build directory with version number - DO NOT CD INTO IT YET!
+# mkdir quick3d-tp1
+#
+# ### copy all the stuff across - cannot shadow build (probably don't want git)
+# (cd ~/depot/qt/quick3d && tar cf - --exclude-vcs .)|(cd quick3d-tp1 && tar xf -)
+#
+# ### if the qmake in the $PATH is not the Qt you want to use
+# ### you can use a binary package or a Qt built from source (even if its installed with
+# ### "make install") as long as it has declarative & opengl
+# # export PATH=/usr/local/Trolltech/Qt-4.7.2/bin:$PATH
+#
+# cd quick3d-tp1
+# export DEB_BUILD_OPTIONS="parallel=4"
+# dpkg-buildpackage -b
+
+# Uncomment this to turn on verbose mode.
+export DH_OPTIONS=-v
+export DH_VERBOSE=1
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/makefile.mk
+
+# Find out how many parallel threads to run 
+TMP_BUILD_OPTS = $(subst $(comma),$(space),$(DEB_BUILD_OPTIONS))
+ifneq (,$(filter parallel=%,$(TMP_BUILD_OPTS)))
+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(TMP_BUILD_OPTS)))
+	PARALLEL_MAKEFLAGS += -j$(NUMJOBS)
+endif
+
+DEB_MAKE_INVOKE := $(MAKE) $(PARALLEL_MAKEFLAGS)
+DEB_MAKE_INSTALL_TARGET := INSTALL_ROOT=$(DEB_DESTDIR) install
+DEB_DH_INSTALL_SOURCEDIR := debian/tmp
+
+common-configure-arch::
+	qmake -spec linux-g++-maemo quick3d.pro CONFIG+=maemo CONFIG+=package
diff --git a/quick3d.pro b/quick3d.pro
index aad3aeb4..454e6532 100644
--- a/quick3d.pro
+++ b/quick3d.pro
@@ -1,7 +1,12 @@
 TEMPLATE = subdirs
 SUBDIRS += src
 !gcov: SUBDIRS += util examples demos
-!package: SUBDIRS += tests
+
+include(pkg.pri)
+
+!package: SUBDIRS += tutorials
+
+SUBDIRS += tests
 CONFIG += ordered
 
 include(doc/doc.pri)
@@ -18,17 +23,19 @@ contains(QT_CONFIG, opengles1) {
     error(QtQuick3D requires Qt Declarative!)
 }
 
+include(pkg.pri)
+
 # Install qt3d.prf into the Qt mkspecs so that "CONFIG += qt3d"
 # can be used in applications to build against Qt3D.
 package {
     distInstalls.files = features/qt3d.prf features/qt3dquick.prf
-    distInstalls.path = $$[QT_INSTALL_DATA]/mkspecs/features
-    INSTALLS += distInstalls
+    distInstalls.path = $$QT3D_INSTALL_DATA/mkspecs/features
+    !qtc_hmtn: INSTALLS += distInstalls
 } else {
     symbian|win32 {
         Qt3DFile=$$PWD\\features\\qt3d.prf
         Qt3DFile=$$replace(Qt3DFile,/,\\)
-        featuresDir=$$[QT_INSTALL_DATA]\\mkspecs\\features
+        featuresDir=$$QT3D_INSTALL_DATA\\mkspecs\\features
         featuresDir=$$replace(featuresDir,/,\\)
         system(copy "$$Qt3DFile $$featuresDir")
 
@@ -37,7 +44,7 @@ package {
         system(copy "$$Qt3DQuickFile $$featuresDir")
     } else {
         Qt3DFile=$$PWD/features/qt3d.prf
-        featuresDir=$$[QT_INSTALL_DATA]/mkspecs/features
+        featuresDir=$$QT3D_INSTALL_DATA/mkspecs/features
         system(cp "$$Qt3DFile $$featuresDir")
 
         Qt3DQuickFile=$$PWD/features/qt3dquick.prf
@@ -55,3 +62,11 @@ symbian {
     symbianinstall.depends = $$SUBDIRS
     symbianinstall.depends -= symbianinstall
 }
+
+OTHER_FILES += \
+    qtc_packaging/debian_harmattan/rules \
+    qtc_packaging/debian_harmattan/README \
+    qtc_packaging/debian_harmattan/copyright \
+    qtc_packaging/debian_harmattan/control \
+    qtc_packaging/debian_harmattan/compat \
+    qtc_packaging/debian_harmattan/changelog
diff --git a/src/imports/shapes/shapes.pro b/src/imports/shapes/shapes.pro
index 2e69a19b..3c607c5b 100644
--- a/src/imports/shapes/shapes.pro
+++ b/src/imports/shapes/shapes.pro
@@ -2,35 +2,17 @@ TEMPLATE = lib
 TARGET  = qshapesqmlplugin
 CONFIG += qt plugin
 
+include(../../../qt3d_pkg_dep.pri)
+include(../../../qt3dquick_pkg_dep.pri)
+
 # See the README in the root dir re this code
 package {
-    macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
-        LIBS += -framework Qt3D -F../../threed
-        LIBS += -framework Qt3DQuick -F../../quick3d
-        INCLUDEPATH += ../../threed/Qt3D.framework/Versions/1/Headers
-        INCLUDEPATH += ../../quick3d/Qt3DQuick.framework/Versions/1/Headers
-    } else {
-        win32 {
-            CONFIG(debug, debug|release) {
-                LIBS += ..\\..\\threed\\debug\\Qt3Dd.lib
-                LIBS += ..\\..\\quick3d\\debug\\Qt3DQuickd.lib
-            } else {
-                LIBS += ..\\..\\threed\\release\\Qt3D.lib
-                LIBS += ..\\..\\quick3d\\release\\Qt3DQuick.lib
-            }
-        } else {
-            LIBS += -L../../threed -lQt3D
-            LIBS += -L../../quick3d -lQt3DQuick
-        }
-        INCLUDEPATH += ../../../include/Qt3D
-        INCLUDEPATH += ../../../include/Qt3DQuick
-    }
-    target.path += $$[QT_INSTALL_IMPORTS]/Qt3D/Shapes
+    target.path += $$QT3D_INSTALL_IMPORTS/Qt3D/Shapes
     INSTALLS += target
     QT += declarative
 } else {
     CONFIG += qt3dquick qt3d
-    DESTDIR = $$[QT_INSTALL_IMPORTS]/Qt3D/Shapes
+    DESTDIR = $$QT3D_INSTALL_IMPORTS/Qt3D/Shapes
 }
 
 win32 {
@@ -76,13 +58,13 @@ qdeclarativesources.files += \
 
 !package {
     qdeclarative_in_place.input = qdeclarativesources.files
-    qdeclarative_in_place.output = $$[QT_INSTALL_IMPORTS]/Qt3D/Shapes/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
+    qdeclarative_in_place.output = $$QT3D_INSTALL_IMPORTS/Qt3D/Shapes/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
     qdeclarative_in_place.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
     qdeclarative_in_place.CONFIG += no_link_no_clean
     qdeclarative_in_place.variable_out = PRE_TARGETDEPS
     QMAKE_EXTRA_COMPILERS += qdeclarative_in_place
 } else {
-    qdeclarativesources.path += $$[QT_INSTALL_IMPORTS]/Qt3D/Shapes
+    qdeclarativesources.path += $$QT3D_INSTALL_IMPORTS/Qt3D/Shapes
     INSTALLS += qdeclarativesources
 }
 
diff --git a/src/imports/threed/threed.pro b/src/imports/threed/threed.pro
index 654bab97..6a42bb60 100644
--- a/src/imports/threed/threed.pro
+++ b/src/imports/threed/threed.pro
@@ -2,35 +2,16 @@ TEMPLATE = lib
 TARGET  = qthreedqmlplugin
 CONFIG += qt plugin
 
+include(../../../qt3d_pkg_dep.pri)
+include(../../../qt3dquick_pkg_dep.pri)
+
 # See the README in the root dir re this code
 package {
-    macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
-        LIBS += -framework Qt3D -F../../threed
-        LIBS += -framework Qt3DQuick -F../../quick3d
-        INCLUDEPATH += ../../threed/Qt3D.framework/Versions/1/Headers
-        INCLUDEPATH += ../../quick3d/Qt3DQuick.framework/Versions/1/Headers
-    } else {
-        win32 {
-            CONFIG(debug, debug|release) {
-                LIBS += ..\\..\\threed\\debug\\Qt3Dd.lib
-                LIBS += ..\\..\\quick3d\\debug\\Qt3DQuickd.lib
-            } else {
-                LIBS += ..\\..\\threed\\release\\Qt3D.lib
-                LIBS += ..\\..\\quick3d\\release\\Qt3DQuick.lib
-            }
-        } else {
-            LIBS += -L../../threed -lQt3D
-            LIBS += -L../../quick3d -lQt3DQuick
-        }
-        INCLUDEPATH += ../../../include/Qt3D
-        INCLUDEPATH += ../../../include/Qt3DQuick
-    }
-    target.path += $$[QT_INSTALL_IMPORTS]/Qt3D
+    target.path += $$QT3D_INSTALL_IMPORTS/Qt3D
     INSTALLS += target
-    QT += declarative opengl
 } else {
     CONFIG += qt3dquick qt3d
-    DESTDIR = $$[QT_INSTALL_IMPORTS]/Qt3D
+    DESTDIR = $$QT3D_INSTALL_IMPORTS/Qt3D
 }
 
 win32 {
@@ -71,13 +52,13 @@ qdeclarativesources.files += \
 
 !package {
     qdeclarative_in_place.input = qdeclarativesources.files
-    qdeclarative_in_place.output = $$[QT_INSTALL_IMPORTS]/Qt3D/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
+    qdeclarative_in_place.output = $$QT3D_INSTALL_IMPORTS/Qt3D/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT}
     qdeclarative_in_place.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
     qdeclarative_in_place.CONFIG += no_link_no_clean
     qdeclarative_in_place.variable_out = PRE_TARGETDEPS
     QMAKE_EXTRA_COMPILERS += qdeclarative_in_place
 } else {
-    qdeclarativesources.path += $$[QT_INSTALL_IMPORTS]/Qt3D
+    qdeclarativesources.path += $$QT3D_INSTALL_IMPORTS/Qt3D
     INSTALLS += qdeclarativesources
 }
 
diff --git a/src/plugins/imageformats/tga/tga.pro b/src/plugins/imageformats/tga/tga.pro
index 6b914fb1..0a681b55 100644
--- a/src/plugins/imageformats/tga/tga.pro
+++ b/src/plugins/imageformats/tga/tga.pro
@@ -1,12 +1,13 @@
 TARGET = qtga
 include(../../qpluginbase.pri)
-!package: DESTDIR = $$[QT_INSTALL_PLUGINS]/imageformats
+include(../../../../pkg.pri)
+!package: DESTDIR = $$QT3D_INSTALL_PLUGINS/imageformats
 HEADERS += qtgahandler.h \
     qtgafile.h
 SOURCES += main.cpp \
     qtgahandler.cpp \
     qtgafile.cpp
-target.path += $$[QT_INSTALL_PLUGINS]/imageformats
+target.path += $$QT3D_INSTALL_PLUGINS/imageformats
 INSTALLS += target
 symbian {
     TARGET.UID3 = 0x20031E99
diff --git a/src/plugins/sceneformats/3ds/3ds.pro b/src/plugins/sceneformats/3ds/3ds.pro
index 62f0f45e..0dabe5fc 100644
--- a/src/plugins/sceneformats/3ds/3ds.pro
+++ b/src/plugins/sceneformats/3ds/3ds.pro
@@ -1,5 +1,6 @@
 TARGET = qscene3ds
 include(../../qpluginbase.pri)
+include(../../../../pkg.pri)
 HEADERS += qgl3dsloader.h \
     qgl3dsscene.h \
     qgl3dsscenehandler.h \
@@ -28,11 +29,11 @@ package {
         }
         INCLUDEPATH += ../../../../include/Qt3D
     }
-    target.path = $$[QT_INSTALL_PLUGINS]/sceneformats]
+    target.path = $$QT3D_INSTALL_PLUGINS/sceneformats]
     INSTALLS += target
 } else {
     CONFIG += qt3d
-    DESTDIR = $$[QT_INSTALL_PLUGINS]/sceneformats
+    DESTDIR = $$QT3D_INSTALL_PLUGINS/sceneformats
 }
 
 system_3ds {
diff --git a/src/plugins/sceneformats/assimp/assimp.pro b/src/plugins/sceneformats/assimp/assimp.pro
index ab5505ca..7924f66d 100644
--- a/src/plugins/sceneformats/assimp/assimp.pro
+++ b/src/plugins/sceneformats/assimp/assimp.pro
@@ -1,5 +1,6 @@
 TARGET = qsceneai
 include(../../qpluginbase.pri)
+include(../../../../pkg.pri)
 HEADERS += qailoader.h \
     qaiscene.h \
     qaiscenehandler.h \
@@ -32,11 +33,11 @@ package {
         }
         INCLUDEPATH += ../../../../include/Qt3D
     }
-    target.path = $$[QT_INSTALL_PLUGINS]/sceneformats
+    target.path = $$QT3D_INSTALL_PLUGINS/sceneformats
     INSTALLS += target
 } else {
     CONFIG += qt3d
-    DESTDIR = $$[QT_INSTALL_PLUGINS]/sceneformats
+    DESTDIR = $$QT3D_INSTALL_PLUGINS/sceneformats
 }
 
 symbian {
diff --git a/src/plugins/sceneformats/bezier/bezier.pro b/src/plugins/sceneformats/bezier/bezier.pro
index 3e0f5933..81556cf4 100644
--- a/src/plugins/sceneformats/bezier/bezier.pro
+++ b/src/plugins/sceneformats/bezier/bezier.pro
@@ -1,5 +1,6 @@
 TARGET  = qscenebezier
 include(../../qpluginbase.pri)
+include(../../../../pkg.pri)
 
 HEADERS += qglbezierscene.h \
            qglbezierscenehandler.h
@@ -25,11 +26,11 @@ package {
         }
         INCLUDEPATH += ../../../../include/Qt3D
     }
-    target.path = $$[QT_INSTALL_PLUGINS]/sceneformats
+    target.path = $$QT3D_INSTALL_PLUGINS/sceneformats
     INSTALLS += target
 } else {
     CONFIG += qt3d
-    DESTDIR = $$[QT_INSTALL_PLUGINS]/sceneformats
+    DESTDIR = $$QT3D_INSTALL_PLUGINS/sceneformats
 }
 symbian {
     LIBS += -lQt3D
diff --git a/src/plugins/sceneformats/obj/obj.pro b/src/plugins/sceneformats/obj/obj.pro
index b27ab680..a14a1ce7 100644
--- a/src/plugins/sceneformats/obj/obj.pro
+++ b/src/plugins/sceneformats/obj/obj.pro
@@ -1,5 +1,6 @@
 TARGET  = qsceneobj
 include(../../qpluginbase.pri)
+include(../../../../pkg.pri)
 
 HEADERS += qglobjscene.h \
            qglobjscenehandler.h
@@ -25,12 +26,12 @@ package {
         }
         INCLUDEPATH += ../../../../include/Qt3D
     }
-    target.path = $$[QT_INSTALL_PLUGINS]/sceneformats
+    target.path = $$QT3D_INSTALL_PLUGINS/sceneformats
     INSTALLS += target
 } else {
     CONFIG += qt3d
-    DESTDIR = $$[QT_INSTALL_PLUGINS]/sceneformats
+    DESTDIR = $$QT3D_INSTALL_PLUGINS/sceneformats
 }
 
-target.path += $$[QT_INSTALL_PLUGINS]/sceneformats
+target.path += $$QT3D_INSTALL_PLUGINS/sceneformats
 INSTALLS += target
diff --git a/src/quick3d/quick3d.pri b/src/quick3d/quick3d.pri
index 6e23c525..35d178ee 100644
--- a/src/quick3d/quick3d.pri
+++ b/src/quick3d/quick3d.pri
@@ -1,4 +1,3 @@
-
 INCLUDEPATH += $$PWD
 VPATH += $$PWD
 
@@ -7,7 +6,7 @@ HEADERS += \
     qdeclarativeitem3d.h \
     qdeclarativeeffect.h \
     qdeclarativemesh.h \
-    qdeclarativeviewport.h
+    qdeclarativeviewport.h \
 
 SOURCES += \
     qdeclarativeeffect.cpp \
diff --git a/src/quick3d/quick3d.pro b/src/quick3d/quick3d.pro
index ac2c5d43..f7d4f3b8 100644
--- a/src/quick3d/quick3d.pro
+++ b/src/quick3d/quick3d.pro
@@ -10,6 +10,8 @@ gcov {
 
 QT += declarative
 
+include(../../pkg.pri)
+
 # See the README in the root dir re this code
 package {
     macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
@@ -28,25 +30,25 @@ package {
         INCLUDEPATH += ../../include/Qt3D
     }
     win32 {
-        target.path = $$[QT_INSTALL_BINS]
+        target.path = $$QT3D_INSTALL_BINS
     } else {
-        target.path = $$[QT_INSTALL_LIBS]
+        target.path = $$QT3D_INSTALL_LIBS
     }
     INSTALLS += target
     QT += opengl network
 } else {
     CONFIG += qt3d
-    DESTDIR = $$[QT_INSTALL_LIBS]
+    DESTDIR = $$QT3D_INSTALL_LIBS
 }
 
 win32 {
     !static:DEFINES += QT_MAKEDLL
     package {
-        installDll.path = $$[QT_INSTALL_BINS]
+        installDll.path = $$QT3D_INSTALL_BINS
         installDll.files = $$DESTDIR_TARGET
         INSTALLS += installDll
     } else {
-        DLLDESTDIR = $$[QT_INSTALL_BINS]
+        DLLDESTDIR = $$QT3D_INSTALL_BINS
     }
     CONFIG(debug, debug|release) {
         TARGET = $$member(TARGET, 0)d
diff --git a/src/threed/threed.pro b/src/threed/threed.pro
index 123f1a24..a8001832 100644
--- a/src/threed/threed.pro
+++ b/src/threed/threed.pro
@@ -10,25 +10,27 @@ gcov {
 QT += opengl \
     network
 
+include(../../pkg.pri)
+
 package {
     win32 {
-        target.path = $$[QT_INSTALL_BINS]
+        target.path = $$QT3D_INSTALL_BINS
     } else {
-        target.path = $$[QT_INSTALL_LIBS]
+        target.path = $$QT3D_INSTALL_LIBS
     }
     INSTALLS += target
 } else {
-    DESTDIR = $$[QT_INSTALL_LIBS]
+    DESTDIR = $$QT3D_INSTALL_LIBS
 }
 
 win32 {
     !static:DEFINES += QT_MAKEDLL
     package {
-        installDll.path = $$[QT_INSTALL_BINS]
+        installDll.path = $$QT3D_INSTALL_BINS
         installDll.files = $$DESTDIR_TARGET
         INSTALLS += installDll
     } else {
-        DLLDESTDIR = $$[QT_INSTALL_BINS]
+        DLLDESTDIR = $$QT3D_INSTALL_BINS
     }
     CONFIG(debug, debug|release) {
         TARGET = $$member(TARGET, 0)d
@@ -51,7 +53,7 @@ DEFINES += QT_BUILD_QT3D_LIB
 
 !contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL
 
-package {
+package: !qtc_harmattan {
     distInstalls.files = $$PUBLIC_HEADERS
     distInstalls.path = $$[QT_INSTALL_HEADERS]/Qt3D
     INSTALLS += distInstalls
diff --git a/tests/manual/animations/animations.pro b/tests/manual/animations/animations.pro
index b4a8a89d..7e4cdf02 100644
--- a/tests/manual/animations/animations.pro
+++ b/tests/manual/animations/animations.pro
@@ -1,53 +1,9 @@
 TEMPLATE = app
 TARGET = tst_animations
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../../shared/qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/tests/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages		
-distInstalls.files = qml		
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET		
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = tst_animations_qml.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
diff --git a/tests/manual/displaymodel/displaymodel.pro b/tests/manual/displaymodel/displaymodel.pro
index 5236cc46..85a9fcbe 100644
--- a/tests/manual/displaymodel/displaymodel.pro
+++ b/tests/manual/displaymodel/displaymodel.pro
@@ -1,53 +1,9 @@
 TEMPLATE = app
 TARGET = tst_displaymodel
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../../shared/qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/tests/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = tst_submesh_qml.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
diff --git a/tests/manual/model3ds/model3ds.pro b/tests/manual/model3ds/model3ds.pro
index ec3178b7..94acaf63 100644
--- a/tests/manual/model3ds/model3ds.pro
+++ b/tests/manual/model3ds/model3ds.pro
@@ -1,53 +1,9 @@
 TEMPLATE = app
 TARGET = tst_model3ds
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../../shared/qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/tests/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = tst_submesh_qml.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
diff --git a/tests/manual/navigation1/navigation1.pro b/tests/manual/navigation1/navigation1.pro
index 2357e6f5..ae30a596 100644
--- a/tests/manual/navigation1/navigation1.pro
+++ b/tests/manual/navigation1/navigation1.pro
@@ -1,53 +1,9 @@
 TEMPLATE = app
 TARGET = tst_navigation1
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../../shared/qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/tests/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = tst_submesh_qml.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
diff --git a/tests/manual/rotation/rotation.pro b/tests/manual/rotation/rotation.pro
index 2f0c7cad..edb7deec 100644
--- a/tests/manual/rotation/rotation.pro
+++ b/tests/manual/rotation/rotation.pro
@@ -1,53 +1,9 @@
 TEMPLATE = app
 TARGET = tst_rotation
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../../shared/qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/tests/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = tst_rotation_qml.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
diff --git a/tests/manual/scaling/scaling.pro b/tests/manual/scaling/scaling.pro
index eed21e1e..a98d3a2c 100644
--- a/tests/manual/scaling/scaling.pro
+++ b/tests/manual/scaling/scaling.pro
@@ -1,53 +1,9 @@
 TEMPLATE = app
 TARGET = tst_scaling
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../../shared/qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/tests/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = tst_scaling_qml.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
diff --git a/tests/manual/submesh/submesh.pro b/tests/manual/submesh/submesh.pro
index 4697698b..d9f4a5f4 100644
--- a/tests/manual/submesh/submesh.pro
+++ b/tests/manual/submesh/submesh.pro
@@ -1,53 +1,9 @@
 TEMPLATE = app
 TARGET = tst_submesh
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../../shared/qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/tests/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = tst_submesh_qml.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
diff --git a/tests/manual/transformations/transformations.pro b/tests/manual/transformations/transformations.pro
index 8c60644e..7a221d54 100644
--- a/tests/manual/transformations/transformations.pro
+++ b/tests/manual/transformations/transformations.pro
@@ -1,53 +1,9 @@
 TEMPLATE = app
 TARGET = tst_transformations
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../../shared/qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/tests/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = tst_transformations_qml.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
diff --git a/tests/manual/translation/translation.pro b/tests/manual/translation/translation.pro
index ce0d21cd..f6adcab7 100644
--- a/tests/manual/translation/translation.pro
+++ b/tests/manual/translation/translation.pro
@@ -1,53 +1,9 @@
 TEMPLATE = app
 TARGET = tst_translation
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../../shared/qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/tests/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = tst_translation_qml.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
diff --git a/tests/tests.pro b/tests/tests.pro
index 6c25dbe4..24db71db 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,2 +1,3 @@
 TEMPLATE = subdirs
-SUBDIRS = auto benchmarks manual
+SUBDIRS = manual
+!package: SUBDIRS += auto benchmarks
diff --git a/examples/qt3d/tutorials/cube1/cube1.pro b/tutorials/qt3d/cube1/cube1.pro
index 0054518f..0054518f 100644
--- a/examples/qt3d/tutorials/cube1/cube1.pro
+++ b/tutorials/qt3d/cube1/cube1.pro
diff --git a/examples/qt3d/tutorials/cube1/cubeview.cpp b/tutorials/qt3d/cube1/cubeview.cpp
index 51e074f6..51e074f6 100644
--- a/examples/qt3d/tutorials/cube1/cubeview.cpp
+++ b/tutorials/qt3d/cube1/cubeview.cpp
diff --git a/examples/qt3d/tutorials/cube1/cubeview.h b/tutorials/qt3d/cube1/cubeview.h
index 04238f58..04238f58 100644
--- a/examples/qt3d/tutorials/cube1/cubeview.h
+++ b/tutorials/qt3d/cube1/cubeview.h
diff --git a/examples/qt3d/tutorials/cube1/main.cpp b/tutorials/qt3d/cube1/main.cpp
index 28fc9bb1..28fc9bb1 100644
--- a/examples/qt3d/tutorials/cube1/main.cpp
+++ b/tutorials/qt3d/cube1/main.cpp
diff --git a/examples/qt3d/tutorials/cube2/cube2.pro b/tutorials/qt3d/cube2/cube2.pro
index 61f496fd..61f496fd 100644
--- a/examples/qt3d/tutorials/cube2/cube2.pro
+++ b/tutorials/qt3d/cube2/cube2.pro
diff --git a/examples/qt3d/tutorials/cube2/cubeview.cpp b/tutorials/qt3d/cube2/cubeview.cpp
index 1dca459a..1dca459a 100644
--- a/examples/qt3d/tutorials/cube2/cubeview.cpp
+++ b/tutorials/qt3d/cube2/cubeview.cpp
diff --git a/examples/qt3d/tutorials/cube2/cubeview.h b/tutorials/qt3d/cube2/cubeview.h
index 04238f58..04238f58 100644
--- a/examples/qt3d/tutorials/cube2/cubeview.h
+++ b/tutorials/qt3d/cube2/cubeview.h
diff --git a/examples/qt3d/tutorials/cube2/main.cpp b/tutorials/qt3d/cube2/main.cpp
index 28fc9bb1..28fc9bb1 100644
--- a/examples/qt3d/tutorials/cube2/main.cpp
+++ b/tutorials/qt3d/cube2/main.cpp
diff --git a/examples/qt3d/tutorials/cube3/cube3.pro b/tutorials/qt3d/cube3/cube3.pro
index b61205e2..b61205e2 100644
--- a/examples/qt3d/tutorials/cube3/cube3.pro
+++ b/tutorials/qt3d/cube3/cube3.pro
diff --git a/examples/qt3d/tutorials/cube3/cubeview.cpp b/tutorials/qt3d/cube3/cubeview.cpp
index 80c3e0f1..80c3e0f1 100644
--- a/examples/qt3d/tutorials/cube3/cubeview.cpp
+++ b/tutorials/qt3d/cube3/cubeview.cpp
diff --git a/examples/qt3d/tutorials/cube3/cubeview.h b/tutorials/qt3d/cube3/cubeview.h
index 04238f58..04238f58 100644
--- a/examples/qt3d/tutorials/cube3/cubeview.h
+++ b/tutorials/qt3d/cube3/cubeview.h
diff --git a/examples/qt3d/tutorials/cube3/main.cpp b/tutorials/qt3d/cube3/main.cpp
index 28fc9bb1..28fc9bb1 100644
--- a/examples/qt3d/tutorials/cube3/main.cpp
+++ b/tutorials/qt3d/cube3/main.cpp
diff --git a/examples/qt3d/tutorials/cube4/cube.qml b/tutorials/qt3d/cube4/cube.qml
index d4ba6d99..d4ba6d99 100644
--- a/examples/qt3d/tutorials/cube4/cube.qml
+++ b/tutorials/qt3d/cube4/cube.qml
diff --git a/examples/qt3d/tutorials/cube4/cube.qrc b/tutorials/qt3d/cube4/cube.qrc
index 70f5024d..70f5024d 100644
--- a/examples/qt3d/tutorials/cube4/cube.qrc
+++ b/tutorials/qt3d/cube4/cube.qrc
diff --git a/examples/qt3d/tutorials/cube4/cube4.pro b/tutorials/qt3d/cube4/cube4.pro
index 46b6c3c2..46b6c3c2 100644
--- a/examples/qt3d/tutorials/cube4/cube4.pro
+++ b/tutorials/qt3d/cube4/cube4.pro
diff --git a/examples/qt3d/tutorials/cube4/cubeview.cpp b/tutorials/qt3d/cube4/cubeview.cpp
index e3045292..e3045292 100644
--- a/examples/qt3d/tutorials/cube4/cubeview.cpp
+++ b/tutorials/qt3d/cube4/cubeview.cpp
diff --git a/examples/qt3d/tutorials/cube4/cubeview.h b/tutorials/qt3d/cube4/cubeview.h
index 4f00216c..4f00216c 100644
--- a/examples/qt3d/tutorials/cube4/cubeview.h
+++ b/tutorials/qt3d/cube4/cubeview.h
diff --git a/examples/qt3d/tutorials/cube4/main.cpp b/tutorials/qt3d/cube4/main.cpp
index 28fc9bb1..28fc9bb1 100644
--- a/examples/qt3d/tutorials/cube4/main.cpp
+++ b/tutorials/qt3d/cube4/main.cpp
diff --git a/examples/qt3d/tutorials/cube4/qtlogo.png b/tutorials/qt3d/cube4/qtlogo.png
index 7d3e97eb..7d3e97eb 100644
--- a/examples/qt3d/tutorials/cube4/qtlogo.png
+++ b/tutorials/qt3d/cube4/qtlogo.png
diff --git a/examples/qt3d/tutorials/penguin/main.cpp b/tutorials/qt3d/penguin/main.cpp
index e5c995db..e5c995db 100644
--- a/examples/qt3d/tutorials/penguin/main.cpp
+++ b/tutorials/qt3d/penguin/main.cpp
diff --git a/examples/qt3d/tutorials/penguin/model.qrc b/tutorials/qt3d/penguin/model.qrc
index 2c330de0..2c330de0 100644
--- a/examples/qt3d/tutorials/penguin/model.qrc
+++ b/tutorials/qt3d/penguin/model.qrc
diff --git a/examples/qt3d/tutorials/penguin/modelview.cpp b/tutorials/qt3d/penguin/modelview.cpp
index 3ba6b735..3ba6b735 100644
--- a/examples/qt3d/tutorials/penguin/modelview.cpp
+++ b/tutorials/qt3d/penguin/modelview.cpp
diff --git a/examples/qt3d/tutorials/penguin/modelview.h b/tutorials/qt3d/penguin/modelview.h
index 978b185f..978b185f 100644
--- a/examples/qt3d/tutorials/penguin/modelview.h
+++ b/tutorials/qt3d/penguin/modelview.h
diff --git a/examples/qt3d/tutorials/penguin/penguin.3ds b/tutorials/qt3d/penguin/penguin.3ds
index 26c09ac0..26c09ac0 100644
--- a/examples/qt3d/tutorials/penguin/penguin.3ds
+++ b/tutorials/qt3d/penguin/penguin.3ds
diff --git a/examples/qt3d/tutorials/penguin/penguin.pro b/tutorials/qt3d/penguin/penguin.pro
index 7f179dbf..7f179dbf 100644
--- a/examples/qt3d/tutorials/penguin/penguin.pro
+++ b/tutorials/qt3d/penguin/penguin.pro
diff --git a/examples/qt3d/tutorials/penguin_advanced/main.cpp b/tutorials/qt3d/penguin_advanced/main.cpp
index e5c995db..e5c995db 100644
--- a/examples/qt3d/tutorials/penguin_advanced/main.cpp
+++ b/tutorials/qt3d/penguin_advanced/main.cpp
diff --git a/examples/qt3d/tutorials/penguin_advanced/model_advanced.qrc b/tutorials/qt3d/penguin_advanced/model_advanced.qrc
index 2c330de0..2c330de0 100644
--- a/examples/qt3d/tutorials/penguin_advanced/model_advanced.qrc
+++ b/tutorials/qt3d/penguin_advanced/model_advanced.qrc
diff --git a/examples/qt3d/tutorials/penguin_advanced/modelview.cpp b/tutorials/qt3d/penguin_advanced/modelview.cpp
index a7249533..a7249533 100644
--- a/examples/qt3d/tutorials/penguin_advanced/modelview.cpp
+++ b/tutorials/qt3d/penguin_advanced/modelview.cpp
diff --git a/examples/qt3d/tutorials/penguin_advanced/modelview.h b/tutorials/qt3d/penguin_advanced/modelview.h
index 38b4340c..38b4340c 100644
--- a/examples/qt3d/tutorials/penguin_advanced/modelview.h
+++ b/tutorials/qt3d/penguin_advanced/modelview.h
diff --git a/examples/qt3d/tutorials/penguin_advanced/penguin.3ds b/tutorials/qt3d/penguin_advanced/penguin.3ds
index 26c09ac0..26c09ac0 100644
--- a/examples/qt3d/tutorials/penguin_advanced/penguin.3ds
+++ b/tutorials/qt3d/penguin_advanced/penguin.3ds
diff --git a/examples/qt3d/tutorials/penguin_advanced/penguin_advanced.pro b/tutorials/qt3d/penguin_advanced/penguin_advanced.pro
index 0afd1326..35aab03e 100644
--- a/examples/qt3d/tutorials/penguin_advanced/penguin_advanced.pro
+++ b/tutorials/qt3d/penguin_advanced/penguin_advanced.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = penguin
-DESTDIR = ../../../../bin/qt3d/tutorials
+DESTDIR = ../../../bin/qt3d/tutorials
 CONFIG += qt warn_on qt3d
 SOURCES = modelview.cpp \
     main.cpp
diff --git a/examples/qt3d/tutorials/tutorials.pro b/tutorials/qt3d/qt3d.pro
index 8c3fdf36..8c3fdf36 100644
--- a/examples/qt3d/tutorials/tutorials.pro
+++ b/tutorials/qt3d/qt3d.pro
diff --git a/tutorials/quick3d/qmlres.h b/tutorials/quick3d/qmlres.h
new file mode 100644
index 00000000..4a809da5
--- /dev/null
+++ b/tutorials/quick3d/qmlres.h
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#ifndef QMLRES_H
+#define QMLRES_H
+
+#include <QtCore/qdir.h>
+#include <QtCore/qcoreapplication.h>
+
+#include <QtCore/qdebug.h>
+
+/*!
+    \internal
+    Returns a string with the path to qml resources, including qml sources,
+    3D assets and textures.  The path depends on the platform, and (for
+    some platforms) whether it was installed from a package or is being run
+    in a development setting.
+*/
+static QString q_get_qmldir(const QString &name)
+{
+    QString qml = name;
+    // try for a Linux package install first
+    QDir pkgdir(QLatin1String("/usr/share/qt4/quick3d/demos"));
+    QString app = QCoreApplication::applicationFilePath();
+    app = app.section(QDir::separator(), -1);
+    if (pkgdir.cd(app) && pkgdir.exists())
+    {
+        qml = pkgdir.filePath(qml);
+    }
+    else
+    {
+        // failing that try Mac (pkg & dev) next
+        QDir dir(QCoreApplication::applicationDirPath());
+        if (dir.path().endsWith(QLatin1String("MacOS")))
+        {
+            if (dir.cdUp() && dir.cd(QLatin1String("Resources"))
+                    && dir.exists())
+            {
+                qml = dir.filePath(qml);
+            }
+            else
+            {
+                qWarning("Expected app bundle with QML resources!");
+            }
+        }
+        else
+        {
+            // for Windows (pkg & dev), and for Linux dev expect to find it
+            // in a "resources" directory next to the binary
+            if (dir.cd(QLatin1String("resources")) && dir.exists())
+            {
+                QString app = QCoreApplication::applicationFilePath();
+                app = QDir::toNativeSeparators(app);
+                //For windows platforms the "app" filepath should have the .exe extension removed.
+                const QString winExtension = ".exe";
+                if (app.right(winExtension.length()) == winExtension) {
+                    app = app.left(app.length() - winExtension.length());
+                }
+
+                //Grab just the app name itself.
+                app = app.section(QDir::separator(), -1);
+
+                if (dir.cd(QLatin1String("tutorials")) && dir.cd(app) && dir.exists())
+                {
+                    qml = dir.filePath(qml);
+                }
+                else
+                {
+                    QString msg = QLatin1String("tutorials");
+                    msg += QDir::separator();
+                    msg += app;
+                    qWarning("Expected %s directry with qml resources!", qPrintable(msg));
+                }
+            }
+        }
+    }
+    return qml;
+}
+
+#endif // QMLRES_H
diff --git a/tutorials/quick3d/quick3d.pro b/tutorials/quick3d/quick3d.pro
new file mode 100644
index 00000000..85436d8c
--- /dev/null
+++ b/tutorials/quick3d/quick3d.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS += shaders  teapot_bounce_qml  teapot_qml
diff --git a/examples/quick3d/tutorials/shaders/TutorialTeapot.qml b/tutorials/quick3d/shaders/TutorialTeapot.qml
index 5f2c29e0..5f2c29e0 100644
--- a/examples/quick3d/tutorials/shaders/TutorialTeapot.qml
+++ b/tutorials/quick3d/shaders/TutorialTeapot.qml
diff --git a/examples/quick3d/tutorials/shaders/meshes/teapot.bez b/tutorials/quick3d/shaders/meshes/teapot.bez
index 02b2ac44..02b2ac44 100644
--- a/examples/quick3d/tutorials/shaders/meshes/teapot.bez
+++ b/tutorials/quick3d/shaders/meshes/teapot.bez
diff --git a/examples/quick3d/tutorials/shaders/shader-tutorial-1-textures.qml b/tutorials/quick3d/shaders/shader-tutorial-1-textures.qml
index 081a94c0..081a94c0 100644
--- a/examples/quick3d/tutorials/shaders/shader-tutorial-1-textures.qml
+++ b/tutorials/quick3d/shaders/shader-tutorial-1-textures.qml
diff --git a/examples/quick3d/tutorials/shaders/shader-tutorial-2-vertex-shader.qml b/tutorials/quick3d/shaders/shader-tutorial-2-vertex-shader.qml
index 37f9ddfd..37f9ddfd 100644
--- a/examples/quick3d/tutorials/shaders/shader-tutorial-2-vertex-shader.qml
+++ b/tutorials/quick3d/shaders/shader-tutorial-2-vertex-shader.qml
diff --git a/examples/quick3d/tutorials/shaders/shader-tutorial-3-transformed-coordinates.qml b/tutorials/quick3d/shaders/shader-tutorial-3-transformed-coordinates.qml
index 6b3595c5..6b3595c5 100644
--- a/examples/quick3d/tutorials/shaders/shader-tutorial-3-transformed-coordinates.qml
+++ b/tutorials/quick3d/shaders/shader-tutorial-3-transformed-coordinates.qml
diff --git a/examples/quick3d/tutorials/shaders/shader-tutorial-lighting.qml b/tutorials/quick3d/shaders/shader-tutorial-lighting.qml
index 94bcee74..94bcee74 100644
--- a/examples/quick3d/tutorials/shaders/shader-tutorial-lighting.qml
+++ b/tutorials/quick3d/shaders/shader-tutorial-lighting.qml
diff --git a/examples/quick3d/tutorials/shaders/shader-tutorial-varying.qml b/tutorials/quick3d/shaders/shader-tutorial-varying.qml
index 3341bb7b..3341bb7b 100644
--- a/examples/quick3d/tutorials/shaders/shader-tutorial-varying.qml
+++ b/tutorials/quick3d/shaders/shader-tutorial-varying.qml
diff --git a/examples/quick3d/tutorials/shaders/shader-tutorial.qml b/tutorials/quick3d/shaders/shader-tutorial.qml
index e76ee58b..e76ee58b 100644
--- a/examples/quick3d/tutorials/shaders/shader-tutorial.qml
+++ b/tutorials/quick3d/shaders/shader-tutorial.qml
diff --git a/examples/quick3d/tutorials/shaders/shaders.pro b/tutorials/quick3d/shaders/shaders.pro
index 05755ad8..e33763fb 100644
--- a/examples/quick3d/tutorials/shaders/shaders.pro
+++ b/tutorials/quick3d/shaders/shaders.pro
@@ -1,7 +1,7 @@
 TEMPLATE = subdirs
 
 # These examples contain no C++ and can simply be copied
-sources.files = . \
+sources.files = .
 
 sources.path = $$[QT_INSTALL_EXAMPLES]/tutorials
 INSTALLS += sources
diff --git a/examples/quick3d/tutorials/shaders/shaders.qmlproject b/tutorials/quick3d/shaders/shaders.qmlproject
index d4909f86..d4909f86 100644
--- a/examples/quick3d/tutorials/shaders/shaders.qmlproject
+++ b/tutorials/quick3d/shaders/shaders.qmlproject
diff --git a/examples/quick3d/tutorials/teapot_bounce_qml/m5-teapot_bounce_qml.desktop b/tutorials/quick3d/teapot_bounce_qml/m5-teapot_bounce_qml.desktop
index 75214a26..75214a26 100644
--- a/examples/quick3d/tutorials/teapot_bounce_qml/m5-teapot_bounce_qml.desktop
+++ b/tutorials/quick3d/teapot_bounce_qml/m5-teapot_bounce_qml.desktop
diff --git a/examples/quick3d/tutorials/teapot_bounce_qml/main.cpp b/tutorials/quick3d/teapot_bounce_qml/main.cpp
index 643aa35a..65b03b85 100644
--- a/examples/quick3d/tutorials/teapot_bounce_qml/main.cpp
+++ b/tutorials/quick3d/teapot_bounce_qml/main.cpp
@@ -43,7 +43,7 @@
 #include <QtDeclarative/qdeclarativeview.h>
 #include <QtCore/qdir.h>
 
-#include "../../qmlres.h"
+#include "../qmlres.h"
 
 int main(int argc, char *argv[])
 {
diff --git a/examples/quick3d/tutorials/teapot_bounce_qml/qml/teapot-bounce.qml b/tutorials/quick3d/teapot_bounce_qml/qml/teapot-bounce.qml
index 7a9e61e6..7a9e61e6 100644
--- a/examples/quick3d/tutorials/teapot_bounce_qml/qml/teapot-bounce.qml
+++ b/tutorials/quick3d/teapot_bounce_qml/qml/teapot-bounce.qml
diff --git a/examples/quick3d/tutorials/teapot_bounce_qml/qml/teapot.bez b/tutorials/quick3d/teapot_bounce_qml/qml/teapot.bez
index 02b2ac44..02b2ac44 100644
--- a/examples/quick3d/tutorials/teapot_bounce_qml/qml/teapot.bez
+++ b/tutorials/quick3d/teapot_bounce_qml/qml/teapot.bez
diff --git a/examples/quick3d/tutorials/teapot_bounce_qml/teapot_bounce_qml.desktop b/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.desktop
index 14bbdce8..14bbdce8 100644
--- a/examples/quick3d/tutorials/teapot_bounce_qml/teapot_bounce_qml.desktop
+++ b/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.desktop
diff --git a/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro b/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro
new file mode 100644
index 00000000..5980f79b
--- /dev/null
+++ b/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.pro
@@ -0,0 +1,11 @@
+TEMPLATE = app
+TARGET = teapot_bounce_qml
+CONFIG += qt warn_on
+CONFIG += qt3dquick
+
+SOURCES += main.cpp
+HEADERS += ../qmlres.h
+
+DESTDIR = ../../../bin
+
+include(../../../qml_pkg.pri)
diff --git a/examples/quick3d/tutorials/teapot_bounce_qml/teapot_bounce_qml.rc b/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.rc
index 1b6228c9..1b6228c9 100644
--- a/examples/quick3d/tutorials/teapot_bounce_qml/teapot_bounce_qml.rc
+++ b/tutorials/quick3d/teapot_bounce_qml/teapot_bounce_qml.rc
diff --git a/examples/quick3d/tutorials/teapot_qml/m5-teapot_qml.desktop b/tutorials/quick3d/teapot_qml/m5-teapot_qml.desktop
index e5a298e6..e5a298e6 100644
--- a/examples/quick3d/tutorials/teapot_qml/m5-teapot_qml.desktop
+++ b/tutorials/quick3d/teapot_qml/m5-teapot_qml.desktop
diff --git a/examples/quick3d/tutorials/teapot_qml/main.cpp b/tutorials/quick3d/teapot_qml/main.cpp
index 5d59766c..ac83cf12 100644
--- a/examples/quick3d/tutorials/teapot_qml/main.cpp
+++ b/tutorials/quick3d/teapot_qml/main.cpp
@@ -43,7 +43,7 @@
 #include <QtDeclarative/qdeclarativeview.h>
 #include <QtCore/qdir.h>
 
-#include "../../qmlres.h"
+#include "../qmlres.h"
 
 int main(int argc, char *argv[])
 {
diff --git a/examples/quick3d/tutorials/teapot_qml/qml/teapot.bez b/tutorials/quick3d/teapot_qml/qml/teapot.bez
index 02b2ac44..02b2ac44 100644
--- a/examples/quick3d/tutorials/teapot_qml/qml/teapot.bez
+++ b/tutorials/quick3d/teapot_qml/qml/teapot.bez
diff --git a/examples/quick3d/tutorials/teapot_qml/qml/teapot.qml b/tutorials/quick3d/teapot_qml/qml/teapot.qml
index 97e0bdf5..97e0bdf5 100644
--- a/examples/quick3d/tutorials/teapot_qml/qml/teapot.qml
+++ b/tutorials/quick3d/teapot_qml/qml/teapot.qml
diff --git a/examples/quick3d/tutorials/teapot_qml/teapot_qml.desktop b/tutorials/quick3d/teapot_qml/teapot_qml.desktop
index 733cb793..733cb793 100644
--- a/examples/quick3d/tutorials/teapot_qml/teapot_qml.desktop
+++ b/tutorials/quick3d/teapot_qml/teapot_qml.desktop
diff --git a/tutorials/quick3d/teapot_qml/teapot_qml.pro b/tutorials/quick3d/teapot_qml/teapot_qml.pro
new file mode 100644
index 00000000..3546e15e
--- /dev/null
+++ b/tutorials/quick3d/teapot_qml/teapot_qml.pro
@@ -0,0 +1,12 @@
+TEMPLATE = app
+TARGET = teapot_qml
+CONFIG += qt warn_on
+CONFIG += qt3dquick
+
+
+SOURCES += main.cpp
+HEADERS += ../qmlres.h
+
+DESTDIR = ../../../bin
+
+include(../../../qml_pkg.pri)
diff --git a/examples/quick3d/tutorials/teapot_qml/teapot_qml.rc b/tutorials/quick3d/teapot_qml/teapot_qml.rc
index 1b6228c9..1b6228c9 100644
--- a/examples/quick3d/tutorials/teapot_qml/teapot_qml.rc
+++ b/tutorials/quick3d/teapot_qml/teapot_qml.rc
diff --git a/tutorials/tutorials.pro b/tutorials/tutorials.pro
new file mode 100644
index 00000000..7855f3f1
--- /dev/null
+++ b/tutorials/tutorials.pro
@@ -0,0 +1,9 @@
+TEMPLATE = subdirs
+SUBDIRS += qt3d quick3d
+
+# These tutorial directories contain code that is of instructive value only,
+# and therefore it is not packaged for installation along with demos and
+# examples, by default.
+
+# To install these apps as part of learning Qt Quick 3D simply follow the
+# technique used in the examples directories.
diff --git a/util/qglinfo/qglinfo.pro b/util/qglinfo/qglinfo.pro
deleted file mode 100644
index d1cf0caf..00000000
--- a/util/qglinfo/qglinfo.pro
+++ /dev/null
@@ -1,46 +0,0 @@
-TARGET = qglinfo
-SOURCES += main.cpp \
-    qglinfowindow.cpp \
-    qglinfo.cpp \
-    aboutdialog.cpp \
-    fpswidget.cpp
-
-package {
-    macx:CONFIG(qt_framework, qt_framework|qt_no_framework) {
-        LIBS += -framework Qt3D -F../../src/threed
-        INCLUDEPATH += ../../src/threed/Qt3D.framework/Versions/1/Headers
-    } else {
-        win32 {
-            CONFIG(debug, debug|release) {
-                LIBS += ..\\..\\src\\threed\\debug\\Qt3Dd.lib
-            } else {
-                LIBS += ..\\..\\src\\threed\\release\\Qt3D.lib
-            }
-        } else {
-            LIBS += -L../../src/threed -lQt3D
-        }
-        INCLUDEPATH += ../../include/Qt3D
-    }
-    target.path += $$[QT_INSTALL_BINS]
-    INSTALLS += target
-    QT += opengl
-} else {
-    CONFIG += qt3d
-    DESTDIR = ../../bin
-}
-
-CONFIG += qt3d warn_on
-FORMS += qglinfowindow.ui \
-    aboutdialog.ui
-HEADERS += qglinfowindow.h \
-    qglinfo.h \
-    aboutdialog.h \
-    fpswidget.h
-RESOURCES += qglinfo.qrc
-
-!contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL
-
-OTHER_FILES += \
-    qglinfo.rc
-
-RC_FILE = qglinfo.rc
diff --git a/util/qglinfo/qtquick3d.ico b/util/qglinfo/qtquick3d.ico
deleted file mode 100644
index b3b85e37..00000000
--- a/util/qglinfo/qtquick3d.ico
+++ /dev/null
diff --git a/util/qglinfo/aboutdialog.cpp b/util/qt3d/qglinfo/aboutdialog.cpp
index e4ae905c..e4ae905c 100644
--- a/util/qglinfo/aboutdialog.cpp
+++ b/util/qt3d/qglinfo/aboutdialog.cpp
diff --git a/util/qglinfo/aboutdialog.h b/util/qt3d/qglinfo/aboutdialog.h
index f8cdbf0d..f8cdbf0d 100644
--- a/util/qglinfo/aboutdialog.h
+++ b/util/qt3d/qglinfo/aboutdialog.h
diff --git a/util/qglinfo/aboutdialog.ui b/util/qt3d/qglinfo/aboutdialog.ui
index 7408bc1e..7408bc1e 100644
--- a/util/qglinfo/aboutdialog.ui
+++ b/util/qt3d/qglinfo/aboutdialog.ui
diff --git a/util/qglinfo/fpswidget.cpp b/util/qt3d/qglinfo/fpswidget.cpp
index 7a914084..7a914084 100644
--- a/util/qglinfo/fpswidget.cpp
+++ b/util/qt3d/qglinfo/fpswidget.cpp
diff --git a/util/qglinfo/fpswidget.h b/util/qt3d/qglinfo/fpswidget.h
index 7d00753b..7d00753b 100644
--- a/util/qglinfo/fpswidget.h
+++ b/util/qt3d/qglinfo/fpswidget.h
diff --git a/util/qglinfo/images/teapot-logo.png b/util/qt3d/qglinfo/images/teapot-logo.png
index a82c33c1..a82c33c1 100644
--- a/util/qglinfo/images/teapot-logo.png
+++ b/util/qt3d/qglinfo/images/teapot-logo.png
diff --git a/util/qglinfo/main.cpp b/util/qt3d/qglinfo/main.cpp
index d426e41a..d426e41a 100644
--- a/util/qglinfo/main.cpp
+++ b/util/qt3d/qglinfo/main.cpp
diff --git a/util/qglinfo/qglinfo.cpp b/util/qt3d/qglinfo/qglinfo.cpp
index afc66ebd..afc66ebd 100644
--- a/util/qglinfo/qglinfo.cpp
+++ b/util/qt3d/qglinfo/qglinfo.cpp
diff --git a/util/qglinfo/qglinfo.h b/util/qt3d/qglinfo/qglinfo.h
index e322a96c..e322a96c 100644
--- a/util/qglinfo/qglinfo.h
+++ b/util/qt3d/qglinfo/qglinfo.h
diff --git a/util/qt3d/qglinfo/qglinfo.pro b/util/qt3d/qglinfo/qglinfo.pro
new file mode 100644
index 00000000..7a4e40e1
--- /dev/null
+++ b/util/qt3d/qglinfo/qglinfo.pro
@@ -0,0 +1,25 @@
+TARGET = qglinfo
+!package: CONFIG += qt3d
+
+include(../../../qt3d_pkg_dep.pri)
+
+SOURCES += main.cpp \
+    qglinfowindow.cpp \
+    qglinfo.cpp \
+    aboutdialog.cpp \
+    fpswidget.cpp
+
+FORMS += qglinfowindow.ui \
+    aboutdialog.ui
+HEADERS += qglinfowindow.h \
+    qglinfo.h \
+    aboutdialog.h \
+    fpswidget.h
+RESOURCES += qglinfo.qrc
+
+!contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL
+
+OTHER_FILES += \
+    qglinfo.rc
+
+RC_FILE = qglinfo.rc
diff --git a/util/qglinfo/qglinfo.qrc b/util/qt3d/qglinfo/qglinfo.qrc
index 1406cc27..1406cc27 100644
--- a/util/qglinfo/qglinfo.qrc
+++ b/util/qt3d/qglinfo/qglinfo.qrc
diff --git a/util/qglinfo/qglinfo.rc b/util/qt3d/qglinfo/qglinfo.rc
index 1b6228c9..1b6228c9 100644
--- a/util/qglinfo/qglinfo.rc
+++ b/util/qt3d/qglinfo/qglinfo.rc
diff --git a/util/qglinfo/qglinfowindow.cpp b/util/qt3d/qglinfo/qglinfowindow.cpp
index f24957a9..f24957a9 100644
--- a/util/qglinfo/qglinfowindow.cpp
+++ b/util/qt3d/qglinfo/qglinfowindow.cpp
diff --git a/util/qglinfo/qglinfowindow.h b/util/qt3d/qglinfo/qglinfowindow.h
index f3b9fcb4..f3b9fcb4 100644
--- a/util/qglinfo/qglinfowindow.h
+++ b/util/qt3d/qglinfo/qglinfowindow.h
diff --git a/util/qglinfo/qglinfowindow.ui b/util/qt3d/qglinfo/qglinfowindow.ui
index 67723d35..67723d35 100644
--- a/util/qglinfo/qglinfowindow.ui
+++ b/util/qt3d/qglinfo/qglinfowindow.ui
diff --git a/examples/quick3d/tutorials/qtquick3d.ico b/util/qt3d/qglinfo/qtquick3d.ico
index b3b85e37..b3b85e37 100644
--- a/examples/quick3d/tutorials/qtquick3d.ico
+++ b/util/qt3d/qglinfo/qtquick3d.ico
diff --git a/util/qt3d/qt3d.pro b/util/qt3d/qt3d.pro
new file mode 100644
index 00000000..bef37965
--- /dev/null
+++ b/util/qt3d/qt3d.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS = qglinfo
diff --git a/util/util.pro b/util/util.pro
index 2fbd43f7..4d58c9bd 100644
--- a/util/util.pro
+++ b/util/util.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
-SUBDIRS = qglinfo
+SUBDIRS = qt3d
 !package: SUBDIRS += meshcvt